Merge branch 'rs/receive-pack-use-labs'

diff --git a/object.c b/object.c
index df86bdd5a5e944f673fc4bddb6383476c9b0e8ae..23d6c9671904cfe273fc16de8a4d2db56b91c3b4 100644 (file)
--- a/object.c
+++ b/object.c
@@ -341,12 +341,7 @@ void add_object_array_with_path(struct object *obj, const char *name,
 
 void add_object_array(struct object *obj, const char *name, struct object_array *array)
 {
-       add_object_array_with_mode(obj, name, array, S_IFINVALID);
-}
-
-void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode)
-{
-       add_object_array_with_path(obj, name, array, mode, NULL);
+       add_object_array_with_path(obj, name, array, S_IFINVALID, NULL);
 }
 
 /*