zulip/tools/fetch-rebase-pull-request

#!/usr/bin/env bash
set -e

if ! git diff-index --quiet HEAD; then
    echo "There are uncommitted changes:"
    git status --short
    echo "Doing nothing to avoid losing your work."
    exit 1
fi

request_id="$1"
remote=${2:-"upstream"}

set -x
git fetch "$remote" "pull/$request_id/head"
git checkout -B "review-${request_id}" "$remote/master"
git reset --hard FETCH_HEAD
git pull --rebase
Use #!/usr/bin/env for bash shebangs. /bin/sh and /usr/bin/env are the only two binaries that NixOS provides at a fixed path (outside a buildFHSUserEnv sandbox). This discussion was split from #11004. Signed-off-by: Anders Kaseorg <andersk@mit.edu> 2018-12-18 02:08:53 +01:00			`#!/usr/bin/env bash`
Add simple tools for fetching content of a pull request by ID. 2015-12-13 02:06:59 +01:00			`set -e`

tools: Add check for uncommitted files to PR review scripts. 2017-04-12 04:07:17 +02:00			`if ! git diff-index --quiet HEAD; then`
git tools: Make error messages more clear. 2017-05-08 19:51:59 +02:00			`echo "There are uncommitted changes:"`
			`git status --short`
			`echo "Doing nothing to avoid losing your work."`
tools: Add check for uncommitted files to PR review scripts. 2017-04-12 04:07:17 +02:00			`exit 1`
			`fi`
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. 2020-03-26 02:28:31 +01:00
Add simple tools for fetching content of a pull request by ID. 2015-12-13 02:06:59 +01:00			`request_id="$1"`
tools: Improve git scripts. Minor fixes that enable the ability to: - Re-run fetch-rebase-pull-request. - Specify the name of the remote repo as an optional second parameter. The default remains 'upstream'. 2016-10-11 20:36:54 +02:00			`remote=${2:-"upstream"}`
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. 2020-03-26 02:28:31 +01:00
			`set -x`
tools: Improve git scripts. Minor fixes that enable the ability to: - Re-run fetch-rebase-pull-request. - Specify the name of the remote repo as an optional second parameter. The default remains 'upstream'. 2016-10-11 20:36:54 +02:00			`git fetch "$remote" "pull/$request_id/head"`
fetch-rebase-pull-request: Fix shellcheck warnings. In tools/fetch-rebase-pull-request line 15: git checkout -B "review-${request_id}" $remote/master ^-- SC2086: Double quote to prevent globbing and word splitting. Signed-off-by: Anders Kaseorg <andersk@mit.edu> 2018-08-03 02:14:49 +02:00			`git checkout -B "review-${request_id}" "$remote/master"`
Add simple tools for fetching content of a pull request by ID. 2015-12-13 02:06:59 +01:00			`git reset --hard FETCH_HEAD`
			`git pull --rebase`