Code

git svn: lookup new parents correctly from svn:mergeinfo
authorEric Wong <normalperson@yhbt.net>
Tue, 22 Dec 2009 20:15:40 +0000 (12:15 -0800)
committerEric Wong <normalperson@yhbt.net>
Tue, 22 Dec 2009 20:15:40 +0000 (12:15 -0800)
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>
git-svn.perl

index 36709607f2d3865cea3b607851d8db478eebdf3a..dba0d12b00797acc213f90f13f677a68ae7dfb5f 100755 (executable)
@@ -3163,7 +3163,8 @@ sub find_extra_svn_parents {
                                next unless $new_parents[$i];
                                next unless $new_parents[$j];
                                my $revs = command_oneline(
-                                       "rev-list", "-1", "$i..$j",
+                                       "rev-list", "-1",
+                                       "$new_parents[$i]..$new_parents[$j]",
                                       );
                                if ( !$revs ) {
                                        undef($new_parents[$i]);