diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-01 22:23:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-01 22:23:57 (GMT) |
| commit | b9347eb224d7b38f29893e75b6ca16a61647a4f2 (patch) | |
| tree | 049d66f4142adde81d99671df8bf0426d369132b /t/t9903-bash-prompt.sh | |
| parent | 7e6a0cc47da79dd22c0338aee8750fda92ced5d9 (diff) | |
| parent | b71dc3e1a04666fae4a4e282973d9b5a122a997c (diff) | |
| download | git-b9347eb224d7b38f29893e75b6ca16a61647a4f2.zip git-b9347eb224d7b38f29893e75b6ca16a61647a4f2.tar.gz git-b9347eb224d7b38f29893e75b6ca16a61647a4f2.tar.bz2 | |
Merge branch 'zk/prompt-rebase-step'
* zk/prompt-rebase-step:
bash-prompt.sh: show where rebase is at when stopped
Diffstat (limited to 't/t9903-bash-prompt.sh')
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index e147a8d..083b319 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -28,6 +28,10 @@ test_expect_success 'setup for prompt tests' ' git checkout -b b2 master && echo 0 > file && git commit -m "second b2" file && + echo 00 > file && + git commit -m "another b2" file && + echo 000 > file && + git commit -m "yet another b2" file && git checkout master ' @@ -243,10 +247,12 @@ test_expect_success 'prompt - inside bare repository' ' ' test_expect_success 'prompt - interactive rebase' ' - printf " (b1|REBASE-i)" > expected + printf " (b1|REBASE-i 2/3)" > expected echo "#!$SHELL_PATH" >fake_editor.sh && cat >>fake_editor.sh <<\EOF && -echo "edit $(git log -1 --format="%h")" > "$1" +echo "exec echo" > "$1" +echo "edit $(git log -1 --format="%h")" >> "$1" +echo "exec echo" >> "$1" EOF test_when_finished "rm -f fake_editor.sh" && chmod a+x fake_editor.sh && @@ -260,7 +266,7 @@ EOF ' test_expect_success 'prompt - rebase merge' ' - printf " (b2|REBASE-m)" > expected && + printf " (b2|REBASE-m 1/3)" > expected && git checkout b2 && test_when_finished "git checkout master" && test_must_fail git rebase --merge b1 b2 && @@ -270,7 +276,7 @@ test_expect_success 'prompt - rebase merge' ' ' test_expect_success 'prompt - rebase' ' - printf " ((t2)|REBASE)" > expected && + printf " ((t2)|REBASE 1/3)" > expected && git checkout b2 && test_when_finished "git checkout master" && test_must_fail git rebase b1 b2 && |