diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 08:59:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 21:13:59 (GMT) |
| commit | 3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e (patch) | |
| tree | b7fc41aa5f6e13fd411ecb212921a72b1d0d1684 /t/t4151-am-abort.sh | |
| parent | 0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (diff) | |
| download | git-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.zip git-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.tar.gz git-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.tar.bz2 | |
tests: use "git xyzzy" form (t3600 - t6999)
Converts tests between t3600-t6300.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4151-am-abort.sh')
| -rwxr-xr-x | t/t4151-am-abort.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 7d86cdf..4448aba 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 && |