mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
5950851e44
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>
38 lines
861 B
Bash
Executable file
38 lines
861 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git am with corrupt input'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
# 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
|
|
'
|
|
|
|
# This used to fail before, too, but with a different diagnostic.
|
|
# 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 am bad-patch.diff 2>actual
|
|
'
|
|
|
|
test_expect_success 'compare diagnostic; ensure file is still here' '
|
|
echo "error: git diff header lacks filename information (line 4)" >expected &&
|
|
test_path_is_file f &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|