summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorSteven Walter <stevenrwalter@gmail.com>2012-08-20 01:39:41 (GMT)
committerEric Wong <normalperson@yhbt.net>2012-10-05 22:48:12 (GMT)
commit14d3ce1120287e0f03d9d0349ba25c36a9b54fd8 (patch)
tree09f41099b09e27778f6da8d5defe6e4a367c4108 /perl
parentf271fad2661d2f26654e9b4b3ecb17ad0ea711e8 (diff)
downloadgit-14d3ce1120287e0f03d9d0349ba25c36a9b54fd8.zip
git-14d3ce1120287e0f03d9d0349ba25c36a9b54fd8.tar.gz
git-14d3ce1120287e0f03d9d0349ba25c36a9b54fd8.tar.bz2
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')
-rw-r--r--perl/Git/SVN.pm1
1 files changed, 0 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index ae3b6a4..88b9164 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;