mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git svn: lookup new parents correctly from svn:mergeinfo

Browse Source 
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>
This commit is contained in:
Eric Wong
2009-12-22 12:15:40 -08:00
parent 063681d72e
commit 0fe19753f2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-svn.perl
View File

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