From 07f604798672ac8b383d714d91d6722ed9f310b1 Mon Sep 17 00:00:00 2001 From: Darragh Bailey Date: Thu, 23 Oct 2014 15:47:31 +0100 Subject: [PATCH] Ensure tree is walked when ordering commits 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 --- git_upstream/lib/searchers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_upstream/lib/searchers.py b/git_upstream/lib/searchers.py index c37e35f..25c3b52 100644 --- a/git_upstream/lib/searchers.py +++ b/git_upstream/lib/searchers.py @@ -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'",