summaryrefslogtreecommitdiff
path: root/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
AgeCommit message (Collapse)AuthorFilesLines
2012-10-05git-svn.perl: keep processing all commits in parents_excludeLibravatar Steven Walter1-0/+53
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>