summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorTuomas Suutari <tuomas.suutari@gmail.com>2010-02-22 18:12:53 (GMT)
committerEric Wong <normalperson@yhbt.net>2010-02-26 09:30:23 (GMT)
commit6a2009e7f34148a737d8832887dcd491905017be (patch)
tree843d8292cd9b077ebaf890c30a654561b88f024b /git-svn.perl
parent9560808f2ef5a34d2a69c454cfa6003a2f8467cb (diff)
downloadgit-6a2009e7f34148a737d8832887dcd491905017be.zip
git-6a2009e7f34148a737d8832887dcd491905017be.tar.gz
git-6a2009e7f34148a737d8832887dcd491905017be.tar.bz2
git-svn: Fix discarding of extra parents from svn:mergeinfo
If parent J is an ancestor of parent I, then parent J should be discarded, not I. Note that J is an ancestor of I if and only if rev-list I..J is emtpy, which is what we are testing here. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 265852f..ed96a03 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3273,7 +3273,7 @@ sub find_extra_svn_parents {
"$new_parents[$i]..$new_parents[$j]",
);
if ( !$revs ) {
- undef($new_parents[$i]);
+ undef($new_parents[$j]);
}
}
}