summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@gnu.org>2015-03-09 15:17:31 -0400
committerAndreas Gruenbacher <agruen@gnu.org>2015-03-09 15:29:15 -0400
commit5c6625bf62a81c114d849faa1a9cc95c126034a5 (patch)
treef8730bd7b6074ce1121742a5896ee685c168742a /src
parent6a55099e7ad90997ea26cb3dc938b3e4d71cdec1 (diff)
downloadpatch-5c6625bf62a81c114d849faa1a9cc95c126034a5.tar.gz
Don't require traditional patch header after "git --diff"
Reported by Tim Waugh <twaugh@redhat.com>. * src/pch.c (intuit_diff_type): Don't require a traditional patch header ("--- old\n+++ new/n") after a "git --diff" header; the "git --diff" header gives us enough information for being able to process subsequent hunks. This deals with corrupted patches more gracefully. * tests/corrupt-patch: New test case. * tests/Makefile.am (TESTS): Add test case.
Diffstat (limited to 'src')
-rw-r--r--src/pch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pch.c b/src/pch.c
index 9d74471..84adba1 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -622,6 +622,7 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
p_name[i] = 0;
}
p_git_diff = true;
+ need_header = false;
}
else if (p_git_diff && strnEQ (s, "index ", 6))
{