From: Florian Weimer Date: Sun, 31 Aug 2008 15:05:09 +0000 (+0200) Subject: git-svn: extract base blob in generate_diff X-Git-Tag: v1.6.1-rc1~269^2~14 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2d0c8accc3fa7de75d7cbe732873ce5a57379020;p=git.git git-svn: extract base blob in generate_diff We need the base blob to compute a delta to be sent to the server. Signed-off-by: Florian Weimer Acked-by: Eric Wong --- diff --git a/git-svn.perl b/git-svn.perl index 7a1d26db8..0479f41b5 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3380,11 +3380,12 @@ sub generate_diff { while (<$diff_fh>) { chomp $_; # this gets rid of the trailing "\0" if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s - $::sha1\s($::sha1)\s + ($::sha1)\s($::sha1)\s ([MTCRAD])\d*$/xo) { push @mods, { mode_a => $1, mode_b => $2, - sha1_b => $3, chg => $4 }; - if ($4 =~ /^(?:C|R)$/) { + sha1_a => $3, sha1_b => $4, + chg => $5 }; + if ($5 =~ /^(?:C|R)$/) { $state = 'file_a'; } else { $state = 'file_b';