diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-15 22:05:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-15 22:12:06 -0800 |
| commit | 4c8725f16abff4be4812d0d07a663250bef3ef0e (patch) | |
| tree | b71f712e939c935fa1cbb0d5f96c8d2ee4af6b73 /show-branch.c | |
| parent | be97bd1b88003f4a19e2832ee0cc6ac20fcab674 (diff) | |
| download | git-4c8725f16abff4be4812d0d07a663250bef3ef0e.tar.gz git-4c8725f16abff4be4812d0d07a663250bef3ef0e.tar.xz | |
topo-order: make --date-order optional.
This adds --date-order to rev-list; it is similar to topo order
in the sense that no parent comes before all of its children,
but otherwise things are still ordered in the commit timestamp
order.
The same flag is also added to show-branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'show-branch.c')
| -rw-r--r-- | show-branch.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/show-branch.c b/show-branch.c index 511fd3b65..5a86ae2f9 100644 --- a/show-branch.c +++ b/show-branch.c @@ -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,7 +545,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 with_current_branch = 0; int head_at = -1; @@ -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) |