From 14d3ce1120287e0f03d9d0349ba25c36a9b54fd8 Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Sun, 19 Aug 2012 21:39:41 -0400 Subject: git-svn.perl: keep processing all commits in parents_exclude This fixes a bug where git finds the incorrect merge parent. Consider a repository with trunk, branch1 of trunk, and branch2 of branch1. Without this change, git interprets a merge of branch2 into trunk as a merge of branch1 into trunk. Signed-off-by: Steven Walter Reviewed-by: Sam Vilain Signed-off-by: Eric Wong --- perl/Git/SVN.pm | 1 - 1 file changed, 1 deletion(-) (limited to 'perl/Git/SVN.pm') diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index ae3b6a417..88b91640c 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1679,7 +1679,6 @@ sub parents_exclude { if ( $commit eq $excluded ) { push @excluded, $commit; $found++; - last; } else { push @new, $commit; -- cgit v1.2.1