summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-22 22:40:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-22 22:40:17 (GMT)
commit716958c9a23cbb4bf671dc89e094742e8ec41793 (patch)
tree46a4a67f30239622d79637ed7b0a1716ad6d5d15 /builtin/describe.c
parent853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3 (diff)
parent47e44ed1dc17d3a94ec4bf8dd29810ab7882041c (diff)
downloadgit-716958c9a23cbb4bf671dc89e094742e8ec41793.zip
git-716958c9a23cbb4bf671dc89e094742e8ec41793.tar.gz
git-716958c9a23cbb4bf671dc89e094742e8ec41793.tar.bz2
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/describe.c')
-rw-r--r--builtin/describe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index a0f52c1..342129f 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -218,7 +218,7 @@ static unsigned long finish_depth_computation(
struct commit *p = parents->item;
parse_commit(p);
if (!(p->object.flags & SEEN))
- insert_by_date(p, list);
+ commit_list_insert_by_date(p, list);
p->object.flags |= c->object.flags;
parents = parents->next;
}
@@ -334,7 +334,7 @@ static void describe(const char *arg, int last_one)
struct commit *p = parents->item;
parse_commit(p);
if (!(p->object.flags & SEEN))
- insert_by_date(p, &list);
+ commit_list_insert_by_date(p, &list);
p->object.flags |= c->object.flags;
parents = parents->next;
}
@@ -362,7 +362,7 @@ static void describe(const char *arg, int last_one)
qsort(all_matches, match_cnt, sizeof(all_matches[0]), compare_pt);
if (gave_up_on) {
- insert_by_date(gave_up_on, &list);
+ commit_list_insert_by_date(gave_up_on, &list);
seen_commits--;
}
seen_commits += finish_depth_computation(&list, &all_matches[0]);