diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-29 06:21:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 18:27:56 (GMT) |
| commit | 1306321ebea4d789974f0d58062664cc35c411e8 (patch) | |
| tree | 6bd827689260ccf16400ccb5783e66b5df6ebda3 /t/t9903-bash-prompt.sh | |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
| download | git-1306321ebea4d789974f0d58062664cc35c411e8.zip git-1306321ebea4d789974f0d58062664cc35c411e8.tar.gz git-1306321ebea4d789974f0d58062664cc35c411e8.tar.bz2 | |
prompt: fix for simple rebase
When we are rebasing without options ('am' mode), the head rebased lives
in '$g/rebase-apply/head-name', so lets use that information so it's
reported the same way as if we were doing other rebases (-i or -m).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9903-bash-prompt.sh')
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 083b319..15521cc 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 && |