diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:54:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:54:28 -0700 |
| commit | 83f18cdd71d9154c9b563d13c502dd475b3ac88c (patch) | |
| tree | d34103ab52b3557e5bb518f980580a46c2ae14da /t | |
| parent | 1d25dd416f08f39042d23340db380f28abb81962 (diff) | |
| parent | 92ab409055f6f8e379a7a0af731dbad7e1d43af0 (diff) | |
| download | git-83f18cdd71d9154c9b563d13c502dd475b3ac88c.tar.gz | |
Sync with maint
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4254-am-corrupt.sh | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index b7da95fac5..85716dd6ec 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -3,20 +3,19 @@ test_description='git am with corrupt input' . ./test-lib.sh -# Note the missing "+++" line: -cat > bad-patch.diff <<'EOF' -From: A U Thor <au.thor@example.com> -diff --git a/f b/f -index 7898192..6178079 100644 ---- a/f -@@ -1 +1 @@ --a -+b -EOF - test_expect_success setup ' - test $? = 0 && - echo a > f && + # Note the missing "+++" line: + cat >bad-patch.diff <<-\EOF && + From: A U Thor <au.thor@example.com> + diff --git a/f b/f + index 7898192..6178079 100644 + --- a/f + @@ -1 +1 @@ + -a + +b + EOF + + echo a >f && git add f && test_tick && git commit -m initial @@ -26,17 +25,12 @@ test_expect_success setup ' # fatal: unable to write file '(null)' mode 100644: Bad address # Also, it had the unwanted side-effect of deleting f. test_expect_success 'try to apply corrupted patch' ' - git am bad-patch.diff 2> actual - test $? = 1 + test_must_fail git am bad-patch.diff 2>actual ' -cat > expected <<EOF -fatal: git diff header lacks filename information (line 4) -EOF - test_expect_success 'compare diagnostic; ensure file is still here' ' - test $? = 0 && - test -f f && + echo "fatal: git diff header lacks filename information (line 4)" >expected && + test_path_is_file f && test_cmp expected actual ' |