summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-01 19:41:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-01 19:41:23 (GMT)
commit534f0e0996c0a5a0bea5bae8ae088a80a929932b (patch)
tree734ca0d418edf3e0443f3c4e4d751d5cbfa8be05 /builtin/log.c
parent55f34c8d39dac8a90d4944a77cb7614256c62018 (diff)
parentaff2e7c0677d882690213d7ddea4a868f8b18325 (diff)
downloadgit-534f0e0996c0a5a0bea5bae8ae088a80a929932b.zip
git-534f0e0996c0a5a0bea5bae8ae088a80a929932b.tar.gz
git-534f0e0996c0a5a0bea5bae8ae088a80a929932b.tar.bz2
Merge branch 'jc/topo-author-date-sort'
"git log" learned the "--author-date-order" option, with which the output is topologically sorted and commits in parallel histories are shown intermixed together based on the author timestamp. * jc/topo-author-date-sort: t6003: add --author-date-order test topology tests: teach a helper to set author dates as well t6003: add --date-order test topology tests: teach a helper to take abbreviated timestamps t/lib-t6000: style fixes log: --author-date-order sort-in-topological-order: use prio-queue prio-queue: priority queue of pointers to structs toposort: rename "lifo" field
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 9e21232..e3222ed 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -237,7 +237,7 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
int i = revs->early_output;
int show_header = 1;
- sort_in_topological_order(&list, revs->lifo);
+ sort_in_topological_order(&list, revs->sort_order);
while (list && i) {
struct commit *commit = list->item;
switch (simplify_commit(revs, commit)) {