submodule: use submodule repos for object lookup

diff --git a/merge-blobs.h b/merge-blobs.h
index 62b569e472450540689bbb0a4d08c1e3cfd89f12..cc31038b807fbee073a063ec83fe298c87fd2b3d 100644 (file)
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -1,8 +1,11 @@
 #ifndef MERGE_BLOBS_H
 #define MERGE_BLOBS_H
 
-#include "blob.h"
+struct blob;
+struct index_state;
 
-extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
+extern void *merge_blobs(struct index_state *, const char *,
+                        struct blob *, struct blob *,
+                        struct blob *, unsigned long *);
 
 #endif /* MERGE_BLOBS_H */