Merge branch 'fc/show-branch-in-rebase-am' into maint
* fc/show-branch-in-rebase-am: prompt: fix for simple rebase
This commit is contained in:
commit
c9cae1e28a
@ -280,6 +280,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"
|
||||
@ -296,6 +297,7 @@ __git_ps1 ()
|
||||
r="|BISECTING"
|
||||
fi
|
||||
|
||||
test -n "$b" ||
|
||||
b="$(git symbolic-ref HEAD 2>/dev/null)" || {
|
||||
detached=yes
|
||||
b="$(
|
||||
|
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user