diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-12-22 12:15:40 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-12-22 12:15:40 -0800 |
| commit | 0fe19753f26e2747f48d1ec6a1761006d75c2d71 (patch) | |
| tree | 6386cdd8ddd4aff52e65032a48c23d479e9b322b | |
| parent | 063681d72e60e80cd14576037728b395ed42e330 (diff) | |
| download | git-0fe19753f26e2747f48d1ec6a1761006d75c2d71.tar.gz git-0fe19753f26e2747f48d1ec6a1761006d75c2d71.tar.xz | |
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>
| -rwxr-xr-x | git-svn.perl | 3 |
1 files changed, 2 insertions, 1 deletions
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]); |