git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] show-branch: make --topo-order noop and default.
@ 2006-01-12  0:05 Junio C Hamano
  2006-01-13  2:24 ` A Large Angry SCM
  0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2006-01-12  0:05 UTC (permalink / raw)
  To: git

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] show-branch: make --topo-order noop and default.
  2006-01-12  0:05 [PATCH] show-branch: make --topo-order noop and default Junio C Hamano
@ 2006-01-13  2:24 ` A Large Angry SCM
  2006-01-13  4:11   ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: A Large Angry SCM @ 2006-01-13  2:24 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Junio C Hamano wrote:
> It really does not make sense not doing --topo-order.
> 

I disagree. I do like to see the chronological commit history of some 
repositories.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] show-branch: make --topo-order noop and default.
  2006-01-13  2:24 ` A Large Angry SCM
@ 2006-01-13  4:11   ` Junio C Hamano
  2006-01-13  5:28     ` A Large Angry SCM
  0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2006-01-13  4:11 UTC (permalink / raw)
  To: gitzilla; +Cc: git

A Large Angry SCM <gitzilla@gmail.com> writes:

> Junio C Hamano wrote:
>> It really does not make sense not doing --topo-order.
>
> I disagree. I do like to see the chronological commit history of some
> repositories.

But the thing is if you do chronological order, you may not see
enough commits without --more=, because show-branches stops at
the first common commit.  Try it yourself in a repository with
merges on topic branches of different vintage, with and without
the option, to see where output stops.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] show-branch: make --topo-order noop and default.
  2006-01-13  4:11   ` Junio C Hamano
@ 2006-01-13  5:28     ` A Large Angry SCM
  0 siblings, 0 replies; 4+ messages in thread
From: A Large Angry SCM @ 2006-01-13  5:28 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Junio C Hamano wrote:
> A Large Angry SCM <gitzilla@gmail.com> writes:
> 
>>Junio C Hamano wrote:
>>>It really does not make sense not doing --topo-order.
>>I disagree. I do like to see the chronological commit history of some
>>repositories.
> 
> But the thing is if you do chronological order, you may not see
> enough commits without --more=, because show-branches stops at
> the first common commit.  Try it yourself in a repository with
> merges on topic branches of different vintage, with and without
> the option, to see where output stops.

Interesting, I don't think I've ever looked far enough to triggered the 
stop condition in my repositories of interest before.

How about making topo-order the default but having an option for 
chronological order?

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2006-01-13  5:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-12  0:05 [PATCH] show-branch: make --topo-order noop and default Junio C Hamano
2006-01-13  2:24 ` A Large Angry SCM
2006-01-13  4:11   ` Junio C Hamano
2006-01-13  5:28     ` A Large Angry SCM

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).