diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-06-27 18:21:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-30 22:45:50 -0700 |
| commit | 653194758ee338b7c87d011007c532ed5cf68d45 (patch) | |
| tree | 4cdb427cd0ac9833f6df95e504375e70f6c9eb7d /builtin-merge-recursive.c | |
| parent | 0989fe9623dc8d98033f6acdcc0c84ec28571b19 (diff) | |
| download | git-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>
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 8 |
1 files changed, 0 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)); |