mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn.perl: keep processing all commits in parents_exclude

Browse Source 
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>
This commit is contained in:
Steven Walter
2012-08-19 21:39:41 -04:00
committed by Eric Wong
parent f271fad266
commit 14d3ce1120
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
perl/Git/SVN.pm
View File

@ -1679,7 +1679,6 @@ sub parents_exclude {
if ( $commit eq $excluded ) {
push @excluded, $commit;
$found++;
last;
}
else {
push @new, $commit;