Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
zulip/tools/fetch-rebase-pull-request

18 lines
396 B
Plaintext
Raw Normal View History

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: Use require_clean_work_tree everywhere. As described in the commit that added this function, this fixes one quite annoying bug and one at least in-principle bug: * On Windows, the simple version (lacking `git update-index --refresh`) routinely gives false positives, making the tools that rely on it basically unusable. * If you have uncommitted changes in the index but manage to have the worktree nevevertheless match HEAD, the simple version will give a false negative and we'd blow away those changes.
2020-03-26 02:27:15 +01:00
this_file=$(readlink -f "${BASH_SOURCE[0]}")
# shellcheck source=lib/git-tools.bash
. "${this_file%/*}"/lib/git-tools.bash
require_clean_work_tree 'check out PR as branch'
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