@matheusbsbs / matheus-bagliano / commits / 0fe19753f2
Fork 0

git svn: lookup new parents correctly from svn:mergeinfo

This appears to be a trivial case where array indices were being passed to git rev-list, instead of the contents stored in the array itself. Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Dec 22, 2009 at 12:15 UTC 0fe19753f26e2747f48d1ec6a1761006d75c2d71
1 file changed +2 -1
git-svn.perl
+2 -1
@@ -3163,7 +3163,8 @@ sub find_extra_svn_parents {
3163 next unless $new_parents[$i];
3164 next unless $new_parents[$j];
3165 my $revs = command_oneline(
3166 - "rev-list", "-1", "$i..$j",
3166 + "rev-list", "-1",
3167 + "$new_parents[$i]..$new_parents[$j]",
3168 );
3169 if ( !$revs ) {
3170 undef($new_parents[$i]);