diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-02-15 01:29:27 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-15 11:09:01 -0800 |
| commit | f16ef7bd4c37fba8c030b87610f646a1fce5d52d (patch) | |
| tree | cda337843542bdeb13cb997b040a185ba87b28e5 | |
| parent | Git 2.14.3 (diff) | |
| download | tgif-f16ef7bd4c37fba8c030b87610f646a1fce5d52d.tar.xz | |
apply: demonstrate a problem applying svn diffs
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>
| -rwxr-xr-x | t/t4135-apply-weird-filenames.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh index 27cb0009fb..b14b808578 100755 --- a/t/t4135-apply-weird-filenames.sh +++ b/t/t4135-apply-weird-filenames.sh @@ -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 |