summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:28 (GMT)
commitcab037cd4b7865c519a00d9f281c06c59d0df1e6 (patch)
treecf12c3b60be1eabe380ebbe786910f5350ba0325 /Documentation
parent8e111e487bbb939406655619e7ed241bd263d85c (diff)
parent0a8bc7068f0bb780ce1f3cb27c4277daed2dbdcd (diff)
downloadgit-cab037cd4b7865c519a00d9f281c06c59d0df1e6.zip
git-cab037cd4b7865c519a00d9f281c06c59d0df1e6.tar.gz
git-cab037cd4b7865c519a00d9f281c06c59d0df1e6.tar.bz2
Merge branch 'dt/remote-helper-doc-re-lock-option'
Doc update. * dt/remote-helper-doc-re-lock-option: clarify documentation for remote helpers
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitremote-helpers.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 43f80c8..a5c3c04 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -297,9 +297,13 @@ Supported if the helper has the "option" capability.
same batch are complete. Only objects which were reported
in the output of 'list' with a sha1 may be fetched this way.
+
-Optionally may output a 'lock <file>' line indicating a file under
-GIT_DIR/objects/pack which is keeping a pack until refs can be
-suitably updated.
+Optionally may output a 'lock <file>' line indicating the full path of
+a file under `$GIT_DIR/objects/pack` which is keeping a pack until
+refs can be suitably updated. The path must end with `.keep`. This is
+a mechanism to name a <pack,idx,keep> tuple by giving only the keep
+component. The kept pack will not be deleted by a concurrent repack,
+even though its objects may not be referenced until the fetch completes.
+The `.keep` file will be deleted at the conclusion of the fetch.
+
If option 'check-connectivity' is requested, the helper must output
'connectivity-ok' if the clone is self-contained and connected.