diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:18:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:18:41 -0700 |
| commit | 5adb37410198bc1d2413df9100bfd5c9f5d844f2 (patch) | |
| tree | 88965e2e39df491a944391791c586fd384b210cb | |
| parent | Merge branch 'nd/clone-connectivity-shortcut' (diff) | |
| parent | prompt: fix for simple rebase (diff) | |
| download | tgif-5adb37410198bc1d2413df9100bfd5c9f5d844f2.tar.xz | |
Merge branch 'fc/show-branch-in-rebase-am'
The bash prompt code (in contrib/) displayed the name of the branch
being rebased when "rebase -i/-m/-p" modes are in use, but not the
plain vanilla "rebase".
* fc/show-branch-in-rebase-am:
prompt: fix for simple rebase
| -rw-r--r-- | contrib/completion/git-prompt.sh | 2 | ||||
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 9f4e6a368c..86a4f3fa49 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -360,6 +360,7 @@ __git_ps1 () step=$(cat "$g/rebase-apply/next") total=$(cat "$g/rebase-apply/last") if [ -f "$g/rebase-apply/rebasing" ]; then + b="$(cat "$g/rebase-apply/head-name")" r="|REBASE" elif [ -f "$g/rebase-apply/applying" ]; then r="|AM" @@ -376,6 +377,7 @@ __git_ps1 () r="|BISECTING" fi + test -n "$b" || b="$(git symbolic-ref HEAD 2>/dev/null)" || { detached=yes b="$( diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 083b319ed1..15521cc4f9 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -276,7 +276,7 @@ test_expect_success 'prompt - rebase merge' ' ' test_expect_success 'prompt - rebase' ' - printf " ((t2)|REBASE 1/3)" > expected && + printf " (b2|REBASE 1/3)" > expected && git checkout b2 && test_when_finished "git checkout master" && test_must_fail git rebase b1 b2 && |