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.
This commit is contained in:
Linus Torvalds 2005-07-06 16:55:53 -07:00
Родитель 960cea2dd1
Коммит 889adfe314
1 изменённых файлов: 1 добавлений и 1 удалений

2
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