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
375 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: Avoid `readlink -f` in *-pull-request scripts. This is a feature of GNU readlink that isn't in the BSD readlink found on macOS. For using this and other GNU coreutils features in our scripts in general, we could use a solution like mobile's tools/lib/ensure-coreutils.sh to get GNU coreutils on the PATH -- check if it's there already, if not then try to find a Homebrew install of it and use that, if not then print a helpful message. But even then there'd be a bootstrapping problem of how to find ensure-coreutils.sh . That involves exactly the same problem as we have for finding git-tools.sh in these lines. So in fact in mobile for the task of finding ensure-coreutils.sh in the first place, we do without `readlink -f` anyway. The one consequence of this behavior-wise is that if you make a symlink somewhere that points directly at that script (say in your `~/bin/`), and try to run it using that symlink, it won't work. (It'll still work just fine if there are symlinks somewhere higher up in the paths involved -- just not for the script itself.) An ideal CLI program really should support that, I think, but lacking a better idea, this seems an acceptable compromise.
2021-04-30 23:49:33 +02:00
this_dir=${BASH_SOURCE[0]%/*}
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
# shellcheck source=lib/git-tools.bash
tools: Avoid `readlink -f` in *-pull-request scripts. This is a feature of GNU readlink that isn't in the BSD readlink found on macOS. For using this and other GNU coreutils features in our scripts in general, we could use a solution like mobile's tools/lib/ensure-coreutils.sh to get GNU coreutils on the PATH -- check if it's there already, if not then try to find a Homebrew install of it and use that, if not then print a helpful message. But even then there'd be a bootstrapping problem of how to find ensure-coreutils.sh . That involves exactly the same problem as we have for finding git-tools.sh in these lines. So in fact in mobile for the task of finding ensure-coreutils.sh in the first place, we do without `readlink -f` anyway. The one consequence of this behavior-wise is that if you make a symlink somewhere that points directly at that script (say in your `~/bin/`), and try to run it using that symlink, it won't work. (It'll still work just fine if there are symlinks somewhere higher up in the paths involved -- just not for the script itself.) An ideal CLI program really should support that, I think, but lacking a better idea, this seems an acceptable compromise.
2021-04-30 23:49:33 +02:00
. "${this_dir}"/lib/git-tools.bash
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
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"
Rename default branch to ‘main’. Signed-off-by: Anders Kaseorg <anders@zulip.com>
2021-09-01 00:15:31 +02:00
git checkout -B "review-${request_id}" "$remote/main"
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