diff options
| author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2020-04-21 02:54:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-23 00:01:00 +0300 |
| commit | 2ed282cc0d541d665dc7561ff962566378328bd6 (patch) | |
| tree | 502ce5ed4e44ca02c22fbe1563eb7e91519c3ec4 /t/t4254-am-corrupt.sh | |
| parent | af6b65d45ef179ed52087e80cb089f6b2349f4ec (diff) | |
t4254: merge 2 steps of a single test
While we are at it, make sure we run a clean up after testing.
In a later patch, we will test for more corrupted patch.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4254-am-corrupt.sh')
| -rwxr-xr-x | t/t4254-am-corrupt.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index fd3bdbfe2c..ddd35498db 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -25,10 +25,8 @@ 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' ' - test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual -' - -test_expect_success 'compare diagnostic; ensure file is still here' ' + test_when_finished "git am --abort" && + test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual && echo "error: git diff header lacks filename information (line 4)" >expected && test_path_is_file f && test_i18ncmp expected actual |