aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-06-27 18:21:55 +0200
committerJunio C Hamano <gitster@pobox.com>2008-06-30 22:45:50 -0700
commit653194758ee338b7c87d011007c532ed5cf68d45 (patch)
tree4cdb427cd0ac9833f6df95e504375e70f6c9eb7d
parent0989fe9623dc8d98033f6acdcc0c84ec28571b19 (diff)
downloadgit-653194758ee338b7c87d011007c532ed5cf68d45.tar.gz
git-653194758ee338b7c87d011007c532ed5cf68d45.tar.xz
Move commit_list_count() to commit.c
This function is useful outside builtin-merge-recursive, for example in builtin-merge. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-merge-recursive.c8
-rw-r--r--commit.c8
-rw-r--r--commit.h1
3 files changed, 9 insertions, 8 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 43bf6aa45..3731853f8 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -42,14 +42,6 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two)
* - *(int *)commit->object.sha1 set to the virtual id.
*/
-static unsigned commit_list_count(const struct commit_list *l)
-{
- unsigned c = 0;
- for (; l; l = l->next )
- c++;
- return c;
-}
-
static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
{
struct commit *commit = xcalloc(1, sizeof(struct commit));
diff --git a/commit.c b/commit.c
index e2d8624d9..bbf9c7541 100644
--- a/commit.c
+++ b/commit.c
@@ -325,6 +325,14 @@ struct commit_list *commit_list_insert(struct commit *item, struct commit_list *
return new_list;
}
+unsigned commit_list_count(const struct commit_list *l)
+{
+ unsigned c = 0;
+ for (; l; l = l->next )
+ c++;
+ return c;
+}
+
void free_commit_list(struct commit_list *list)
{
while (list) {
diff --git a/commit.h b/commit.h
index 2d94d4148..7f8c5ee0f 100644
--- a/commit.h
+++ b/commit.h
@@ -41,6 +41,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
int parse_commit(struct commit *item);
struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
+unsigned commit_list_count(const struct commit_list *l);
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
void free_commit_list(struct commit_list *list);