diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-12-09 10:16:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-12-09 10:16:58 +0100 |
| commit | 6e6a36ce308ae81529027b6e18f7ba1aeabe8dd7 (patch) | |
| tree | f72a5374d31cd5ba9458d4131d9256caf411028d /contrib/devtools/github-merge.sh | |
| parent | Merge pull request #5216 (diff) | |
| download | discoin-6e6a36ce308ae81529027b6e18f7ba1aeabe8dd7.tar.xz discoin-6e6a36ce308ae81529027b6e18f7ba1aeabe8dd7.zip | |
contrib: show pull # in prompt for github-merge script
Diffstat (limited to 'contrib/devtools/github-merge.sh')
| -rwxr-xr-x | contrib/devtools/github-merge.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh index 3217a0619..6f68496ed 100755 --- a/contrib/devtools/github-merge.sh +++ b/contrib/devtools/github-merge.sh @@ -136,6 +136,9 @@ else echo "Dropping you on a shell so you can try building/testing the merged source." >&2 echo "Run 'git diff HEAD~' to show the changes being merged." >&2 echo "Type 'exit' when done." >&2 + if [[ -f /etc/debian_version ]]; then # Show pull number in prompt on Debian default prompt + export debian_chroot="$PULL" + fi bash -i read -p "Press 'm' to accept the merge. " -n 1 -r >&2 echo |