diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/replace-object.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/replace-object.c')
| -rw-r--r-- | third_party/git/replace-object.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/third_party/git/replace-object.c b/third_party/git/replace-object.c index 7bd9aba6ee6c..e295e8794310 100644 --- a/third_party/git/replace-object.c +++ b/third_party/git/replace-object.c @@ -34,23 +34,14 @@ static int register_replace_ref(struct repository *r, void prepare_replace_object(struct repository *r) { - if (r->objects->replace_map_initialized) + if (r->objects->replace_map) return; - pthread_mutex_lock(&r->objects->replace_mutex); - if (r->objects->replace_map_initialized) { - pthread_mutex_unlock(&r->objects->replace_mutex); - return; - } - r->objects->replace_map = xmalloc(sizeof(*r->objects->replace_map)); oidmap_init(r->objects->replace_map, 0); for_each_replace_ref(r, register_replace_ref, NULL); - r->objects->replace_map_initialized = 1; - - pthread_mutex_unlock(&r->objects->replace_mutex); } /* We allow "recursive" replacement. Only within reason, though */ |