diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:51 -0800 |
| commit | 41905647fc6c94632b48b7caf65eaf3ae18f6d70 (patch) | |
| tree | be9411ef291bc2d6eeeb98f87d89239776d3bca9 /t | |
| parent | 06dbc1ea5768618337bf11e5f64c4f9f14a68008 (diff) | |
| parent | da915939fd7523cd145ba280cc974d46aa792331 (diff) | |
| download | git-41905647fc6c94632b48b7caf65eaf3ae18f6d70.tar.gz git-41905647fc6c94632b48b7caf65eaf3ae18f6d70.tar.xz | |
Merge branch 'ag/patch-header-verify'
* ag/patch-header-verify:
builtin-apply.c: fix the --- and +++ header filename consistency check
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4133-apply-filenames.sh | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh new file mode 100755 index 000000000..34218071b --- /dev/null +++ b/t/t4133-apply-filenames.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# +# Copyright (c) 2010 Andreas Gruenbacher +# + +test_description='git apply filename consistency check' + +. ./test-lib.sh + +test_expect_success setup ' + cat > bad1.patch <<EOF +diff --git a/f b/f +new file mode 100644 +index 0000000..d00491f +--- /dev/null ++++ b/f-blah +@@ -0,0 +1 @@ ++1 +EOF + cat > bad2.patch <<EOF +diff --git a/f b/f +deleted file mode 100644 +index d00491f..0000000 +--- b/f-blah ++++ /dev/null +@@ -1 +0,0 @@ +-1 +EOF +' + +test_expect_success 'apply diff with inconsistent filenames in headers' ' + test_must_fail git apply bad1.patch 2>err + grep "inconsistent new filename" err + test_must_fail git apply bad2.patch 2>err + grep "inconsistent old filename" err +' + +test_done |