| commit | 14d3ce1120287e0f03d9d0349ba25c36a9b54fd8 | |
| author | Steven Walter <stevenrwalter@gmail.com> | |
| Mon, 20 Aug 2012 01:39:41 +0000 (19 21:39 -0400) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Fri, 5 Oct 2012 22:48:12 +0000 (5 22:48 +0000) | ||
| tree | 09f41099b09e27778f6da8d5defe6e4a367c4108 | treesnapshot (tar.gz zip) |
| parent | f271fad2661d2f26654e9b4b3ecb17ad0ea711e8 | commitdiff |
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>
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>
| perl/Git/SVN.pm | diffblobblamehistory | |
| t/t9166-git-svn-fetch-merge-branch-of-branch2.sh | [new file with mode: 0755] | blob |