summaryrefslogtreecommitdiff
path: root/t/t4133-apply-filenames.sh
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-01-18 22:37:38 +0100
committerJunio C Hamano <gitster@pobox.com>2010-01-18 17:08:59 -0800
commitda915939fd7523cd145ba280cc974d46aa792331 (patch)
tree01bd424f3ff95bfe3d0a09d8946c73b062f159e4 /t/t4133-apply-filenames.sh
parentb9cb07726a7a288244b585939850348f319e5e0c (diff)
downloadgit-da915939fd7523cd145ba280cc974d46aa792331.tar.gz
builtin-apply.c: fix the --- and +++ header filename consistency check
gitdiff_verify_name() only did a filename prefix check because of an off-by-one error. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4133-apply-filenames.sh')
-rwxr-xr-xt/t4133-apply-filenames.sh38
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 0000000000..34218071b6
--- /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