From 58218291fa73a17020ef0447398e9e8a78f9e8c7 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 9 Aug 2015 04:37:39 +0000 Subject: Vendor import subversion-1.8.14 --- subversion/libsvn_diff/parse-diff.c | 1 + 1 file changed, 1 insertion(+) (limited to 'subversion/libsvn_diff/parse-diff.c') diff --git a/subversion/libsvn_diff/parse-diff.c b/subversion/libsvn_diff/parse-diff.c index a01b4d52743b..e269ef925b38 100644 --- a/subversion/libsvn_diff/parse-diff.c +++ b/subversion/libsvn_diff/parse-diff.c @@ -1313,6 +1313,7 @@ svn_diff_parse_next_patch(svn_patch_t **patch, line_after_tree_header_read = TRUE; } else if (! valid_header_line && state != state_start + && state != state_git_diff_seen && !starts_with(line->data, "index ")) { /* We've encountered an invalid diff header. -- cgit v1.2.3