diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:21 -0800 |
| commit | f7f43afb190131d4502f00cecd2361ebbd654030 (patch) | |
| tree | 3f4bfaefb50f3bb51b14ac1e74522b21a0018429 /t/t3419-rebase-patch-id.sh | |
| parent | Merge branch 'ag/rebase-avoid-unneeded-checkout' (diff) | |
| parent | t4124: only mark git command with test_must_fail (diff) | |
| download | tgif-f7f43afb190131d4502f00cecd2361ebbd654030.tar.xz | |
Merge branch 'dl/test-must-fail-fixes-2'
Test updates.
* dl/test-must-fail-fixes-2:
t4124: only mark git command with test_must_fail
t3507: use test_path_is_missing()
t3507: fix indentation
t3504: do check for conflict marker after failed cherry-pick
t3419: stop losing return code of git command
t3415: increase granularity of test_auto_{fixup,squash}()
t3415: stop losing return codes of git commands
t3310: extract common notes_merge_files_gone()
t3030: use test_path_is_missing()
t2018: replace "sha" with "oid"
t2018: don't lose return code of git commands
t2018: teach do_checkout() to accept `!` arg
t2018: be more discerning when checking for expected exit codes
t2018: improve style of if-statement
t2018: add space between function name and ()
t2018: remove trailing space from test description
Diffstat (limited to 't/t3419-rebase-patch-id.sh')
| -rwxr-xr-x | t/t3419-rebase-patch-id.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh index 49f548cdb9..94552669ae 100755 --- a/t/t3419-rebase-patch-id.sh +++ b/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' ' |