From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 6 Jul 2005 23:55:53 +0000 (-0700)
Subject: Make gitk use --topo-order instead of --merge-order
X-Git-Tag: v0.99~40
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;ds=sidebyside;h=889adfe31477455b57a17e15436095e744c3f1e7;p=git.git

Make gitk use --topo-order instead of --merge-order

It's cheaper to calculate, and doesn't give different results depending
on the order of the arguments passed in (and is thus more appropriate
for something like gitk that can validly take the unordered "--all" flag
to show all branches).

The previous dup fix seems to have fixed --topo-order.  Holler if you
still see problems.
---

diff --git a/gitk b/gitk
index f969c14f..fa222df7 100755
--- a/gitk
+++ b/gitk
@@ -37,7 +37,7 @@ proc getcommits {rargs} {
 	set parsed_args $rargs
     }
     if [catch {
-	set commfd [open "|git-rev-list --header --merge-order $parsed_args" r]
+	set commfd [open "|git-rev-list --header --topo-order $parsed_args" r]
     } err] {
 	puts stderr "Error executing git-rev-list: $err"
 	exit 1