submodule deinit: unset core.worktree

diff --git a/replace-object.h b/replace-object.h
index 15315311fb892e24129162cef0f61eddfc6fff78..f996de3d62c6aaa9d30792e5347613ff1f63fbe0 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -3,6 +3,7 @@
 
 #include "oidmap.h"
 #include "repository.h"
+#include "object-store.h"
 
 struct replace_object {
        struct oidmap_entry original;
@@ -13,7 +14,8 @@ struct replace_object {
  * This internal function is only declared here for the benefit of
  * lookup_replace_object().  Please do not call it directly.
  */
-extern const struct object_id *do_lookup_replace_object(const struct object_id *oid);
+extern const struct object_id *do_lookup_replace_object(struct repository *r,
+                                                       const struct object_id *oid);
 
 /*
  * If object sha1 should be replaced, return the replacement object's
@@ -21,11 +23,14 @@ extern const struct object_id *do_lookup_replace_object(const struct object_id *
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
  */
-static inline const struct object_id *lookup_replace_object(const struct object_id *oid)
+static inline const struct object_id *lookup_replace_object(struct repository *r,
+                                                           const struct object_id *oid)
 {
-       if (!check_replace_refs)
+       if (!check_replace_refs ||
+           (r->objects->replace_map &&
+            r->objects->replace_map->map.tablesize == 0))
                return oid;
-       return do_lookup_replace_object(oid);
+       return do_lookup_replace_object(r, oid);
 }
 
 #endif /* REPLACE_OBJECT_H */