diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-13 01:34:37 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-13 01:34:37 +0300 |
commit | 038763c71aef650178b8f0ace2118eae882ae61f (patch) | |
tree | c41d1cb85f3450b65995e690ffad839fb438cab0 | |
parent | e4ec05ed93bede22b0d79ab58997f0fc170929e9 (diff) | |
parent | c00bfc9d1be8ae45c4d321b1cb02f146ce670f33 (diff) |
Merge branch 'js/t9903-chaining'
* 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" ' |