config: improve error message for boolean config

[thirdparty/git.git] / replace-object.h

diff --git a/replace-object.h b/replace-object.h
index 16528df942f79e3d7ce65d99e0103395d0c69f51..3fbc32eb7b7ef7bf9119f83aa7e3a4b6c20104b3 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -16,20 +16,25 @@ void prepare_replace_object(struct repository *r);
  * 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(struct repository *r,
-                                                       const struct object_id *oid);
+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
  * name (replaced recursively, if necessary).  The return value is
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
+ *
+ * Note: some thread debuggers might point a data race on the
+ * replace_map_initialized reading in this function. However, we know there's no
+ * problem in the value being updated by one thread right after another one read
+ * it here (and it should be written to only once, anyway).
  */
 static inline const struct object_id *lookup_replace_object(struct repository *r,
                                                            const struct object_id *oid)
 {
        if (!read_replace_refs ||
-           (r->objects->replace_map &&
+           (r->objects->replace_map_initialized &&
             r->objects->replace_map->map.tablesize == 0))
                return oid;
        return do_lookup_replace_object(r, oid);