diff options
author | Steven Walter <stevenrwalter@gmail.com> | 2012-08-20 05:39:41 +0400 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2012-10-06 02:48:12 +0400 |
commit | 14d3ce1120287e0f03d9d0349ba25c36a9b54fd8 (patch) | |
tree | 09f41099b09e27778f6da8d5defe6e4a367c4108 /perl/Git/SVN.pm | |
parent | f271fad2661d2f26654e9b4b3ecb17ad0ea711e8 (diff) |
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 <stevenrwalter@gmail.com>
Reviewed-by: Sam Vilain <sam@vilain.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'perl/Git/SVN.pm')
-rw-r--r-- | perl/Git/SVN.pm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index ae3b6a4179..88b91640c2 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; |