svn commit: r1705387 - in /subversion/branches/patch-exec: ./ subversion/libsvn_diff/parse-diff.c

[da...@apache.org]

Author: danielsh
Date: Fri Sep 25 23:30:41 2015
New Revision: 1705387

URL: http://svn.apache.org/viewvc?rev=1705387&view=rev
Log:
On the patch-exec branch, sync with trunk.

This picks up r1705386, which is required for the next commit.

Modified:
    subversion/branches/patch-exec/   (props changed)
    subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c

Propchange: subversion/branches/patch-exec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 25 23:30:41 2015
@@ -94,4 +94,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1692717-1705384
+/subversion/trunk:1692717-1705386

Modified: subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c?rev=1705387&r1=1705386&r2=1705387&view=diff
==============================================================================
--- subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c Fri Sep 25 23:30:41 2015
@@ -2100,7 +2100,8 @@ svn_diff_parse_next_patch(svn_patch_t **
           /* We have a valid diff header, yay! */
           break;
         }
-      else if (state == state_git_tree_seen && line_after_tree_header_read)
+      else if (state == state_git_tree_seen && line_after_tree_header_read
+               && !valid_header_line)
         {
           /* git patches can contain an index line after the file mode line */
           if (!starts_with(line->data, "index "))