[thirdparty/git.git] / t / t4133-apply-filenames.sh

#!/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
Commit	Line	Data
da915939 AG	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2010 Andreas Gruenbacher
	4	#
	5
	6	test_description='git apply filename consistency check'
	7
	8	. ./test-lib.sh
	9
	10	test_expect_success setup '
a48fcd83	11	cat > bad1.patch <<EOF &&
da915939 AG	12	diff --git a/f b/f
	13	new file mode 100644
	14	index 0000000..d00491f
	15	--- /dev/null
	16	+++ b/f-blah
	17	@@ -0,0 +1 @@
	18	+1
	19	EOF
	20	cat > bad2.patch <<EOF
	21	diff --git a/f b/f
	22	deleted file mode 100644
	23	index d00491f..0000000
	24	--- b/f-blah
	25	+++ /dev/null
	26	@@ -1 +0,0 @@
	27	-1
	28	EOF
	29	'
	30
	31	test_expect_success 'apply diff with inconsistent filenames in headers' '
a48fcd83 JN	32	test_must_fail git apply bad1.patch 2>err &&
	33	grep "inconsistent new filename" err &&
	34	test_must_fail git apply bad2.patch 2>err &&
da915939 AG	35	grep "inconsistent old filename" err
	36	'
	37
	38	test_done