summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-12-22 20:15:40 (GMT)
committerEric Wong <normalperson@yhbt.net>2009-12-22 20:15:40 (GMT)
commit0fe19753f26e2747f48d1ec6a1761006d75c2d71 (patch)
tree6386cdd8ddd4aff52e65032a48c23d479e9b322b /git-svn.perl
parent063681d72e60e80cd14576037728b395ed42e330 (diff)
downloadgit-0fe19753f26e2747f48d1ec6a1761006d75c2d71.zip
git-0fe19753f26e2747f48d1ec6a1761006d75c2d71.tar.gz
git-0fe19753f26e2747f48d1ec6a1761006d75c2d71.tar.bz2
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 3670960..dba0d12 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]);