diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:44 -0700 |
| commit | 294573e6d7acfc648d52a6f59cbe43db8847f836 (patch) | |
| tree | d262b93d8fa44168019078b724f0f3d074ffc093 | |
| parent | c3befaeab9ebd0def9f03d434a52cf40614c65f9 (diff) | |
| parent | c00bfc9d1be8ae45c4d321b1cb02f146ce670f33 (diff) | |
| download | git-294573e6d7acfc648d52a6f59cbe43db8847f836.tar.gz | |
Merge branch 'js/t9903-chaining' into maint
Test fix.
* js/t9903-chaining:
t9903: fix broken && chain
| -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 0db4469c89..97c9b32c2e 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -177,7 +177,7 @@ test_expect_success 'prompt - interactive rebase' ' git checkout b1 && test_when_finished "git checkout master" && git rebase -i HEAD^ && - test_when_finished "git rebase --abort" + test_when_finished "git rebase --abort" && __git_ps1 >"$actual" && test_cmp expected "$actual" ' |