svn commit: r1705386 - /subversion/trunk/subversion/libsvn_diff/parse-diff.c

[da...@apache.org]

Author: danielsh
Date: Fri Sep 25 23:29:09 2015
New Revision: 1705386

URL: http://svn.apache.org/viewvc?rev=1705386&view=rev
Log:
* subversion/libsvn_diff/parse-diff.c
  (svn_diff_parse_next_patch): Only attempt to parse an "index" line if the
    line wasn't otherwise recognized.
    .
    This seems to have no effect on trunk's behaviour, but will make
    a difference for an upcoming change on the 'patch-exec' branch.

Modified:
    subversion/trunk/subversion/libsvn_diff/parse-diff.c

Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1705386&r1=1705385&r2=1705386&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Fri Sep 25 23:29:09 2015
@@ -1896,7 +1896,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 "))