X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft4151-am-abort.sh;h=4448aba7e0727b70a4e525e57ad21cd7e226c1f8;hb=3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e;hp=7d86cdff64522f588a3d3e781cf2b272087cfd88;hpb=0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0;p=thirdparty%2Fgit.git diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 7d86cdff64..4448aba7e0 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -44,14 +44,14 @@ do ' test_expect_success "am$with3 --skip continue after failed am$with3" ' - test_must_fail git-am$with3 --skip >output && + test_must_fail git am$with3 --skip >output && test "$(grep "^Applying" output)" = "Applying: 6" && test_cmp file-2-expect file-2 && test ! -f .git/rr-cache/MERGE_RR ' test_expect_success "am --abort goes back after failed am$with3" ' - git-am --abort && + git am --abort && git rev-parse HEAD >actual && git rev-parse initial >expect && test_cmp expect actual &&