kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Steven Walter	14d3ce1120	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>	2012-10-05 22:48:12 +00:00

Author

SHA1

Message

Date

Steven Walter

14d3ce1120

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>

2012-10-05 22:48:12 +00:00

1 Commits (7952ea66e72d1129afbebcdde11dcbeecd92698a)