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.

1 files changed, 3 insertions, 12 deletions

diff --git a/third_party/git/Documentation/gitremote-helpers.txt b/third_party/git/Documentation/gitremote-helpers.txt
index f48a031dc346..43f80c806838 100644
--- a/third_party/git/Documentation/gitremote-helpers.txt
+++ b/third_party/git/Documentation/gitremote-helpers.txt
@@ -297,13 +297,9 @@ 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 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.
+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.
 +
 If option 'check-connectivity' is requested, the helper must output
 'connectivity-ok' if the clone is self-contained and connected.
@@ -509,11 +505,6 @@ set by Git if the remote helper has the 'option' capability.
 	Indicate that only the objects wanted need to be fetched, not
 	their dependents.
 
-'option atomic' {'true'|'false'}::
-	When pushing, request the remote server to update refs in a single atomic
-	transaction.  If successful, all refs will be updated, or none will.  If the
-	remote side does not support this capability, the push will fail.
-
 SEE ALSO
 --------
 linkgit:git-remote[1]