diff options
Diffstat (limited to 'third_party/git/t/t3419-rebase-patch-id.sh')
| -rwxr-xr-x | third_party/git/t/t3419-rebase-patch-id.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/git/t/t3419-rebase-patch-id.sh b/third_party/git/t/t3419-rebase-patch-id.sh index 49f548cdb93d..d93458377690 100755 --- a/third_party/git/t/t3419-rebase-patch-id.sh +++ b/third_party/git/t/t3419-rebase-patch-id.sh @@ -80,7 +80,8 @@ do_tests () { git commit -q -m "change big file again" && git checkout -q other^{} && git rebase master && - test_must_fail test -n "$(git rev-list master...HEAD~)" + git rev-list master...HEAD~ >revs && + test_must_be_empty revs ' test_expect_success $pr 'do not drop patch' ' @@ -90,7 +91,7 @@ do_tests () { git commit -q -m squashed && git checkout -q other^{} && test_must_fail git rebase squashed && - rm -rf .git/rebase-apply + git rebase --quit ' } |