Skip to content

Commit 0fe1975

Browse files
author
Eric Wong
committed
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 <[email protected]>
1 parent 063681d commit 0fe1975

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-svn.perl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3163,7 +3163,8 @@ sub find_extra_svn_parents {
31633163
next unless $new_parents[$i];
31643164
next unless $new_parents[$j];
31653165
my $revs = command_oneline(
3166-
"rev-list", "-1", "$i..$j",
3166+
"rev-list", "-1",
3167+
"$new_parents[$i]..$new_parents[$j]",
31673168
);
31683169
if ( !$revs ) {
31693170
undef($new_parents[$i]);

0 commit comments

Comments
 (0)