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/http-push.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/http-push.c')
-rw-r--r-- | third_party/git/http-push.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/git/http-push.c b/third_party/git/http-push.c index 822f32659936..0353f9f5143d 100644 --- a/third_party/git/http-push.c +++ b/third_party/git/http-push.c @@ -501,10 +501,10 @@ static void release_request(struct transfer_request *request) if (request == request_queue_head) { request_queue_head = request->next; } else { - while (entry && entry->next != request) + while (entry->next != NULL && entry->next != request) entry = entry->next; - if (entry) - entry->next = request->next; + if (entry->next == request) + entry->next = entry->next->next; } free(request->url); @@ -981,7 +981,7 @@ static int unlock_remote(struct remote_lock *lock) while (prev && prev->next != lock) prev = prev->next; if (prev) - prev->next = lock->next; + prev->next = prev->next->next; } free(lock->owner); |