From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/Documentation/git-gc.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'third_party/git/Documentation/git-gc.txt') diff --git a/third_party/git/Documentation/git-gc.txt b/third_party/git/Documentation/git-gc.txt index 0c114ad1ca..247f765604 100644 --- a/third_party/git/Documentation/git-gc.txt +++ b/third_party/git/Documentation/git-gc.txt @@ -115,14 +115,15 @@ NOTES ----- 'git gc' tries very hard not to delete objects that are referenced -anywhere in your repository. In particular, it will keep not only -objects referenced by your current set of branches and tags, but also -objects referenced by the index, remote-tracking branches, notes saved -by 'git notes' under refs/notes/, reflogs (which may reference commits -in branches that were later amended or rewound), and anything else in -the refs/* namespace. If you are expecting some objects to be deleted -and they aren't, check all of those locations and decide whether it -makes sense in your case to remove those references. +anywhere in your repository. In +particular, it will keep not only objects referenced by your current set +of branches and tags, but also objects referenced by the index, +remote-tracking branches, refs saved by 'git filter-branch' in +refs/original/, reflogs (which may reference commits in branches +that were later amended or rewound), and anything else in the refs/* namespace. +If you are expecting some objects to be deleted and they aren't, check +all of those locations and decide whether it makes sense in your case to +remove those references. On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using -- cgit 1.4.1