x/git-upstream
Code Issues Proposed changes

Ensure tree is walked when ordering commits

Browse Source 
In order for any ordering of merge-bases to be performed, rev-list needs
to traverse the tree in order to ensure it returns the correct
topological order.

Change-Id: I027e3667d2ae1dba3ec51a2d9e116cb453b47729
This commit is contained in:
Darragh Bailey
2014-10-23 15:47:31 +01:00
parent 2bd1362b90
commit 07f6047986
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git_upstream/lib/searchers.py
View File

@@ -262,7 +262,7 @@ class UpstreamMergeBaseSearcher(LogDedentMixin, Searcher):
%s
""", (" \\\n" + " " * 8).join(merge_bases))
sha1 = self.git.rev_list(
*merge_bases, topo_order=True, max_count=1, no_walk=True)
*merge_bases, topo_order=True, max_count=1)
# now that we have the sha1, make sure to save the commit object
self.commit = self.repo.commit(sha1)
self.log.debug("Most recent merge-base commit is: '%s'",