summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-26 00:43:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-26 00:43:29 (GMT)
commitd590ae5560619108c437a76f3ebd5b0fd9ed8fcf (patch)
tree86246aa812c90cb096ae451344d12a37a863efe3 /Documentation
parent608cc4f2738d5e2055e238b2a9e482180d948a05 (diff)
parentfa9ab027bac58e4133b6fcea82c459934edb03b1 (diff)
downloadgit-d590ae5560619108c437a76f3ebd5b0fd9ed8fcf.zip
git-d590ae5560619108c437a76f3ebd5b0fd9ed8fcf.tar.gz
git-d590ae5560619108c437a76f3ebd5b0fd9ed8fcf.tar.bz2
Merge branch 'mz/doc-notes-are-not-anchors'
Objects that lost references can be pruned away, even when they have notes attached to it (and these notes will become dangling, which in turn can be pruned with "git notes prune"). This has been clarified in the documentation. * mz/doc-notes-are-not-anchors: docs: clarify that refs/notes/ do not keep the attached objects alive
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-gc.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 0c114ad..853967d 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -117,12 +117,14 @@ 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.
+objects referenced by the index, remote-tracking branches, reflogs
+(which may reference commits in branches that were later amended or
+rewound), and anything else in the refs/* namespace. Note that a note
+(of the kind created by 'git notes') attached to an object does not
+contribute in keeping the object alive. 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