mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 02:53:58 +01:00
Code

apply: demonstrate a problem applying svn diffs

Browse Source 
Subversion generates diffs that contain funny ---/+++ lines containing
more than just the file names. Example:

	--- a/trunk/README	(revision 4711)
	+++ /dev/null	(nonexistent)

Let's add a test case demonstrating that apply cannot handle the
/dev/null line (although it can handle the trunk/README line just fine).

Reported in https://github.com/git-for-windows/git/issues/1489

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2018-02-15 01:29:27 +01:00 committed by Junio C Hamano
parent fc849d8d6b
commit f16ef7bd4c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
t/t4135-apply-weird-filenames.sh
View File

@ -89,4 +89,21 @@ test_expect_success 'traditional, whitespace-damaged, colon in timezone' '
test_cmp expected "post image.txt"
'
cat >diff-from-svn <<\EOF
Index: Makefile
===================================================================
diff --git a/branches/Makefile
deleted file mode 100644
--- a/branches/Makefile (revision 13)
+++ /dev/null (nonexistent)
@@ +1 0,0 @@
-
EOF
test_expect_failure 'apply handles a diff generated by Subversion' '
>Makefile &&
git apply -p2 diff-from-svn &&
test_path_is_missing Makefile
'
test_done