| CARVIEW |
Instantly share code, notes, and snippets.
Either copy the aliases from the .gitconfig or run the commands in add-pr-alias.sh
Easily checkout local copies of pull requests from remotes:
git pr 4 - creates local branch pr/4 from the github upstream(if it exists) or origin remote and checks it outgit pr 4 someremote - creates local branch pr/4 from someremote remote and checks it outgit pr-clean - removes all pr/* branches from your local repogit spr - Same as git pr command, but for bitbucket/stash remotes| # for github remotes | |
| [alias] | |
| pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f" | |
| pr-clean = "!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done" | |
| # for bitbucket/stash remotes | |
| spr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull-requests/$1/from:pr/$1 && git checkout pr/$1; }; f" | |
| #!/bin/sh | |
| # For github | |
| git config --global alias.pr '!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f' | |
| git config --global alias.pr-clean '!git for-each-ref refs/heads/pr/* --format="%(refname)" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done' | |
| # For stash/bitbucket | |
| git config --global alias.spr '!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull-requests/$1/from:pr/$1 && git checkout pr/$1; }; f' |
Added prr to grab from remote, i.e. prr upstream 55
Added pru to grab from "upstream" in case you have that branch name (pretty common)
I like these as bash aliases rather than git aliases. Here's my adaptation (in ~/.bashrc):
pr() {
git fetch -fu origin refs/pull/$1/head:pr/$1
git checkout pr/$1
}
prc() {
git for-each-ref refs/heads/pr/* --format='%(refname)' | \
while read ref; do git branch -D ${ref#refs/heads/}; done
}
Exactly what I needed.
Thanks. I have removed the "noise" (pr, pru, prr) though:
pr = !git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && :
so now you can
git pr 123
git pr 123 upstream
This is great. Thanks!
nice, thanks!
I've combined @whit537 and @andreineculau's suggestions:
[alias]
pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
...now you can do git pr 482 upstream and switch to that branch immediately.
@rstacruz - cheers - updated the gist to reflect your version, I like the bash defaulting - neat trick I always forget I can use :)
Hey @gnarf, I've opened a pr for this in git-extras: tj/git-extras#262
So cool !
Building on the building (and lazy defaults), since a lot of people use an upstream remote and that's where PRs are often worked... :)
pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
@bdowling makes sense!
thanks!!
If I checkout a pr, and I want to modified it, and then push it back to wait pr author to review it.
How can I do that?
https://github.com/github/hub is also pretty cool to manage PRs from the command line.
$ hub pr --help
Usage: hub pr list [-s <STATE>] [-h <HEAD>] [-b <BASE>] [-o <SORT_KEY> [-^]] [-f <FORMAT>] [-L <LIMIT>]
hub pr checkout <PR-NUMBER> [<BRANCH>]
I use this alias to checkout a PR by number
alias cpr='hub pr checkout' # usage `cpr <PR id>`
I wonder if git pr 123 remotename should create pr/remotename/123 instead of pr/123. My current situation is that I have a PR to some project and somebody had a PR for my PR.
There is a better way to write git pr-clean:
[alias]
pr-clean = "!git for-each-ref --format 'delete %(refname)' 'refs/heads/pr/**' | git update-ref --stdin"I can also offer an overengineered improved version of git pr with better logic for remote name autodetection (useful for me because I hate when my tools don't handle corner cases well) and incorporating @kwk's suggestion:
[alias]
# includes heuristics for `git-hub` and `gh`
zz-guess-upstream = "!f() { \
for u; do \
[[ $u != -* ]] && git config \"remote.$u.url\" &>/dev/null && echo \"$u\" && return; \
done; \
git config hub.upstreamremote && return; \
while IFS='' read -r u; do \
[[ \"$(git config \"remote.$u.gh-resolved\")\" == base ]] && echo \"$u\" && return; \
done < <(git remote); \
for u in upstream origin; do \
git config \"remote.$u.url\" &>/dev/null && echo \"$u\" && return; \
done; \
return 1; \
}; f"
pr = "!f() { \
remote=\"$(git zz-guess-upstream \"${@:2:1}\")\" || return; \
prefix=\"pr${2:+\"/$2\"}\"; \
git fetch -fu \"$r\" \"refs/pull/$1/head:$prefix/$1\" || return; \
git checkout \"$prefix/$1\"; \
}; f"
pr-clean = "!f() { \
[[ ${1+set} ]] && glob=\"$1/*\" || glob=\"**\"; \
git for-each-ref --format 'delete %(refname)' \"refs/heads/pr/$glob\" \
| tee /dev/stderr \
| git update-ref --stdin; \
}; f"
Added
pr-cleanto deletepr/*branches at request of @scottgonzalez