diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-22 14:40:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-22 14:40:17 -0800 |
| commit | 716958c9a23cbb4bf671dc89e094742e8ec41793 (patch) | |
| tree | 46a4a67f30239622d79637ed7b0a1716ad6d5d15 /builtin/show-branch.c | |
| parent | 853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3 (diff) | |
| parent | 47e44ed1dc17d3a94ec4bf8dd29810ab7882041c (diff) | |
| download | git-716958c9a23cbb4bf671dc89e094742e8ec41793.tar.gz git-716958c9a23cbb4bf671dc89e094742e8ec41793.tar.xz | |
Merge branch 'tf/commit-list-prefix'
* tf/commit-list-prefix:
commit: Add commit_list prefix in two function names.
Conflicts:
sha1_name.c
Diffstat (limited to 'builtin/show-branch.c')
| -rw-r--r-- | builtin/show-branch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 8663ccaa9..da695815e 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -243,7 +243,7 @@ static void join_revs(struct commit_list **list_p, if (mark_seen(p, seen_p) && !still_interesting) extra--; p->object.flags |= flags; - insert_by_date(p, list_p); + commit_list_insert_by_date(p, list_p); } } @@ -859,7 +859,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) */ commit->object.flags |= flag; if (commit->object.flags == flag) - insert_by_date(commit, &list); + commit_list_insert_by_date(commit, &list); rev[num_rev] = commit; } for (i = 0; i < num_rev; i++) @@ -868,7 +868,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) if (0 <= extra) join_revs(&list, &seen, num_rev, extra); - sort_by_date(&seen); + commit_list_sort_by_date(&seen); if (merge_base) return show_merge_base(seen, num_rev); |