From 6a2009e7f34148a737d8832887dcd491905017be Mon Sep 17 00:00:00 2001
From: Tuomas Suutari <tuomas.suutari@gmail.com>
Date: Mon, 22 Feb 2010 20:12:53 +0200
Subject: 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>
---
 git-svn.perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-svn.perl')

diff --git a/git-svn.perl b/git-svn.perl
index 265852f459..ed96a03059 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]);
 				}
 			}
 		}
-- 
cgit v1.2.1