Implemented manual packfile switching in fast-import.

diff --git a/merge-recursive.c b/merge-recursive.c
index 52370213092c13bd02988493b21489ec61fb2593..b4acbb74080ad308625fcff09be0af51c2b4111d 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1066,13 +1066,10 @@ static int merge_trees(struct tree *head,
                path_list_clear(re_head, 0);
                path_list_clear(entries, 1);
 
-       } else {
-               clean = 1;
-               printf("merging of trees %s and %s resulted in %s\n",
-                      sha1_to_hex(head->object.sha1),
-                      sha1_to_hex(merge->object.sha1),
-                      sha1_to_hex((*result)->object.sha1));
        }
+       else
+               clean = 1;
+
        if (index_only)
                *result = git_write_tree();