mirror of https://github.com/zulip/zulip.git
tools: Apply `set -x` to just the interesting parts of *-pull-request.
The Git commands we're invoking to do the real work are useful to print, for transparency to see what's happening and that there's no magic here. The boring shell stuff like `remote=${2:-"upstream"}` is not so helpful, and nor is the rather arcane and in any case read-only command `git diff-index --quiet HEAD`. Those only add noise that obscures the interesting parts. So, move the `set -x` down to when we're done with the boring preparatory stuff and ready to perform the commands that do the work.
This commit is contained in:
parent
4ac633d432
commit
fc0b99cd62
|
@ -1,16 +1,17 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -e
|
set -e
|
||||||
set -x
|
|
||||||
|
|
||||||
if ! git diff-index --quiet HEAD; then
|
if ! git diff-index --quiet HEAD; then
|
||||||
set +x
|
|
||||||
echo "There are uncommitted changes:"
|
echo "There are uncommitted changes:"
|
||||||
git status --short
|
git status --short
|
||||||
echo "Doing nothing to avoid losing your work."
|
echo "Doing nothing to avoid losing your work."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
request_id="$1"
|
request_id="$1"
|
||||||
remote=${2:-"upstream"}
|
remote=${2:-"upstream"}
|
||||||
|
|
||||||
|
set -x
|
||||||
git fetch "$remote" "pull/$request_id/head"
|
git fetch "$remote" "pull/$request_id/head"
|
||||||
git checkout -B "review-original-${request_id}"
|
git checkout -B "review-original-${request_id}"
|
||||||
git reset --hard FETCH_HEAD
|
git reset --hard FETCH_HEAD
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -e
|
set -e
|
||||||
set -x
|
|
||||||
|
|
||||||
if ! git diff-index --quiet HEAD; then
|
if ! git diff-index --quiet HEAD; then
|
||||||
set +x
|
|
||||||
echo "There are uncommitted changes:"
|
echo "There are uncommitted changes:"
|
||||||
git status --short
|
git status --short
|
||||||
echo "Doing nothing to avoid losing your work."
|
echo "Doing nothing to avoid losing your work."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
request_id="$1"
|
request_id="$1"
|
||||||
remote=${2:-"upstream"}
|
remote=${2:-"upstream"}
|
||||||
|
|
||||||
|
set -x
|
||||||
git fetch "$remote" "pull/$request_id/head"
|
git fetch "$remote" "pull/$request_id/head"
|
||||||
git checkout -B "review-${request_id}" "$remote/master"
|
git checkout -B "review-${request_id}" "$remote/master"
|
||||||
git reset --hard FETCH_HEAD
|
git reset --hard FETCH_HEAD
|
||||||
|
|
Loading…
Reference in New Issue