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

[st...@apache.org]

Author: stsp
Date: Fri May  2 19:45:21 2014
New Revision: 1592014

URL: http://svn.apache.org/r1592014
Log:
Fix an 'svn patch' bug where targets were incorrectly skipped
with --git diffs produced by recent versions of git.

* subversion/libsvn_diff/parse-diff.c
  (svn_diff_parse_next_patch): Don't give up on unknown lines in-between
   a 'diff --git' header line and the actual patch.

Reported by: Eric Berge <er...@gmail.com>

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=1592014&r1=1592013&r2=1592014&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Fri May  2 19:45:21 2014
@@ -1291,6 +1291,7 @@ svn_diff_parse_next_patch(svn_patch_t **
           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.