merge-recursive: switch from (oid,mode) pairs to a diff_filespec

diff --git a/fetch-object.h b/fetch-object.h
index f371300c882d74c70adbd0334dcd7f8d0a6e556e..d6444caa5ac11b586fba327b66c647e81b0c1d90 100644 (file)
--- a/fetch-object.h
+++ b/fetch-object.h
@@ -1,6 +1,9 @@
 #ifndef FETCH_OBJECT_H
 #define FETCH_OBJECT_H
 
-extern void fetch_object(const char *remote_name, const unsigned char *sha1);
+struct object_id;
+
+void fetch_objects(const char *remote_name, const struct object_id *oids,
+                  int oid_nr);
 
 #endif