Add new test to ensure git-merge handles more than 25 refs.

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 43bf6aa45eeacbb67490c809070f40023ce4e434..3731853f83be37d3790a5db8ef037af0b0a4f7c5 100644 (file)
--- 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));