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/fetch-pack.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/fetch-pack.c')
| -rw-r--r-- | builtin/fetch-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index dbd8b7bcc..b99941393 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -47,7 +47,7 @@ static void rev_list_push(struct commit *commit, int mark) if (parse_commit(commit)) return; - insert_by_date(commit, &rev_list); + commit_list_insert_by_date(commit, &rev_list); if (!(commit->object.flags & COMMON)) non_common_revs++; @@ -436,7 +436,7 @@ static int mark_complete(const char *path, const unsigned char *sha1, int flag, if (o && o->type == OBJ_COMMIT) { struct commit *commit = (struct commit *)o; commit->object.flags |= COMPLETE; - insert_by_date(commit, &complete); + commit_list_insert_by_date(commit, &complete); } return 0; } |