X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-merge-recursive.c;h=3731853f83be37d3790a5db8ef037af0b0a4f7c5;hb=88bbda08d7b9503862a8fb8846d78c67825e5e3d;hp=43bf6aa45eeacbb67490c809070f40023ce4e434;hpb=24cd49f627ab0d313f8f7925e1f6f855563fea43;p=git.git

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));