submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree

diff --git a/object.h b/object.h
index 38198bb73a14665a8c5b31d3ec26e05a0b8bd8f1..177b1a4571fb60f75d523124c09c133c2f5c84e6 100644 (file)
--- a/object.h
+++ b/object.h
@@ -57,8 +57,9 @@ struct object_array {
 
 /*
  * object flag allocation:
- * revision.h:               0---------10                                26
- * fetch-pack.c:             0----5
+ * revision.h:               0---------10                              2526
+ * fetch-pack.c:             01
+ * negotiator/default.c:       2--5
  * walker.c:                 0-2
  * upload-pack.c:                4       11----------------19
  * builtin/blame.c:                        12-13
@@ -124,8 +125,7 @@ void *object_as_type(struct repository *r, struct object *obj, enum object_type
  *
  * Returns NULL if the object is missing or corrupt.
  */
-#define parse_object(r, oid) parse_object_##r(oid)
-struct object *parse_object_the_repository(const struct object_id *oid);
+struct object *parse_object(struct repository *r, const struct object_id *oid);
 
 /*
  * Like parse_object, but will die() instead of returning NULL. If the