From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 22 Dec 2009 20:15:40 +0000 (-0800)
Subject: git svn: lookup new parents correctly from svn:mergeinfo
X-Git-Tag: v1.6.6~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0fe19753f26e2747f48d1ec6a1761006d75c2d71;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index 36709607f..dba0d12b0 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -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]);