X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=show-branch.c;h=5a86ae2f9ed3159d082158c04bea51c39cb4477f;hb=b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69;hp=7a0dcc649edaf6a823e15f60d04c6ce67348dc42;hpb=0620db36f85788193de2102884ff8dd94222660f;p=git.git

diff --git a/show-branch.c b/show-branch.c
index 7a0dcc64..5a86ae2f 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -258,8 +258,8 @@ static void show_one_commit(struct commit *commit, int no_name)
 	char pretty[256], *cp;
 	struct commit_name *name = commit->object.util;
 	if (commit->object.parsed)
-		pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
-				    pretty, sizeof(pretty));
+		pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
+				    pretty, sizeof(pretty), 0);
 	else
 		strcpy(pretty, "(unavailable)");
 	if (!strncmp(pretty, "[PATCH] ", 8))
@@ -535,6 +535,7 @@ int main(int ac, char **av)
 	int num_rev, i, extra = 0;
 	int all_heads = 0, all_tags = 0;
 	int all_mask, all_revs;
+	int lifo = 1;
 	char head_path[128];
 	const char *head_path_p;
 	int head_path_len;
@@ -544,12 +545,11 @@ int main(int ac, char **av)
 	int no_name = 0;
 	int sha1_name = 0;
 	int shown_merge_point = 0;
-	int topo_order = 0;
 	int with_current_branch = 0;
 	int head_at = -1;
 
-	git_config(git_show_branch_config);
 	setup_git_directory();
+	git_config(git_show_branch_config);
 
 	/* If nothing is specified, try the default first */
 	if (ac == 1 && default_num) {
@@ -586,7 +586,9 @@ int main(int ac, char **av)
 		else if (!strcmp(arg, "--independent"))
 			independent = 1;
 		else if (!strcmp(arg, "--topo-order"))
-			topo_order = 1;
+			lifo = 1;
+		else if (!strcmp(arg, "--date-order"))
+			lifo = 0;
 		else
 			usage(show_branch_usage);
 		ac--; av++;
@@ -710,8 +712,7 @@ int main(int ac, char **av)
 		exit(0);
 
 	/* Sort topologically */
-	if (topo_order)
-		sort_in_topological_order(&seen);
+	sort_in_topological_order(&seen, lifo);
 
 	/* Give names to commits */
 	if (!sha1_name && !no_name)