diff options
| author | Christian Couder <christian.couder@gmail.com> | 2016-08-08 23:03:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-11 12:41:46 -0700 |
| commit | 5950851e44fc6f19e9fc9261bac4a61e59fc5121 (patch) | |
| tree | ace39a2c5bf09604002357a5b1dc61274c6ecd06 /t | |
| parent | 3bee345d7b6c7d95e9585b224320689979a58f9e (diff) | |
| download | git-5950851e44fc6f19e9fc9261bac4a61e59fc5121.tar.gz | |
builtin/apply: make find_header() return -128 instead of die()ing
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in builtin/apply.c, let's make find_header() return -128 instead of
calling die().
We could make it return -1, unfortunately find_header() already
returns -1 when no header is found.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4254-am-corrupt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index 85716dd6ec..9bd7dd2ba1 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -29,7 +29,7 @@ test_expect_success 'try to apply corrupted patch' ' ' test_expect_success 'compare diagnostic; ensure file is still here' ' - echo "fatal: git diff header lacks filename information (line 4)" >expected && + echo "error: git diff header lacks filename information (line 4)" >expected && test_path_is_file f && test_cmp expected actual ' |