[PATCH] show-branch: make --topo-order noop and default.
It really does not make sense not doing --topo-order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* Currently in "pu".
show-branch.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
d899f2bfc64b44e776a87f9c8fdd6abfe819690b
diff --git a/show-branch.c b/show-branch.c
index 9f7e188..f296a87 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -544,7 +544,6 @@ int main(int ac, char **av)
int no_name = 0;
int sha1_name = 0;
int shown_merge_point = 0;
- int topo_order = 0;
int no_current_branch = 0;
git_config(git_show_branch_config);
@@ -585,7 +584,8 @@ int main(int ac, char **av)
else if (!strcmp(arg, "--independent"))
independent = 1;
else if (!strcmp(arg, "--topo-order"))
- topo_order = 1;
+ /* noop */
+ ;
else
usage(show_branch_usage);
ac--; av++;
@@ -707,8 +707,7 @@ int main(int ac, char **av)
exit(0);
/* Sort topologically */
- if (topo_order)
- sort_in_topological_order(&seen);
+ sort_in_topological_order(&seen);
/* Give names to commits */
if (!sha1_name && !no_name)
--
1.1.1-g8ecb
Junio C Hamano <junkio@cox.net>