undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/show-branch-in-rebase-am'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2013-06-06 12:18:41 -07:00
commit 5adb374101
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-prompt.sh
View File

@ -360,6 +360,7 @@ __git_ps1 ()
step=$(cat "$g/rebase-apply/next") step=$(cat "$g/rebase-apply/next")
total=$(cat "$g/rebase-apply/last") total=$(cat "$g/rebase-apply/last")
if [ -f "$g/rebase-apply/rebasing" ]; then if [ -f "$g/rebase-apply/rebasing" ]; then
b="$(cat "$g/rebase-apply/head-name")"
r="|REBASE" r="|REBASE"
elif [ -f "$g/rebase-apply/applying" ]; then elif [ -f "$g/rebase-apply/applying" ]; then
r="|AM" r="|AM"
@ -376,6 +377,7 @@ __git_ps1 ()
r="|BISECTING" r="|BISECTING"
fi fi
test -n "$b" ||
b="$(git symbolic-ref HEAD 2>/dev/null)" || { b="$(git symbolic-ref HEAD 2>/dev/null)" || {
detached=yes detached=yes
b="$( b="$(

2
t/t9903-bash-prompt.sh
View File

@ -276,7 +276,7 @@ test_expect_success 'prompt - rebase merge' '
' '
test_expect_success 'prompt - rebase' ' test_expect_success 'prompt - rebase' '
printf " ((t2)|REBASE 1/3)" > expected && printf " (b2|REBASE 1/3)" > expected &&
git checkout b2 && git checkout b2 &&
test_when_finished "git checkout master" && test_when_finished "git checkout master" &&
test_must_fail git rebase b1 b2 && test_must_fail git rebase b1 b2 &&