summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-06-08 18:34:59 -0700
committerJunio C Hamano <gitster@pobox.com>2020-06-08 18:34:59 -0700
commit19f41f003bf9a1a09bee3e0865ff0c333c88c0e2 (patch)
treea26ebf8ab42070f6cdfb67cf49ed71a282a97459
parent3ef9e6768d632ffc1a3da0561187482e2bd16263 (diff)
downloadgit-htmldocs-19f41f003bf9a1a09bee3e0865ff0c333c88c0e2.tar.gz
Autogenerated HTML docs for v2.27.0-83-g0313f
-rw-r--r--RelNotes/2.28.0.txt31
-rw-r--r--git-bugreport.html7
-rw-r--r--git-bugreport.txt1
-rw-r--r--git-commit-graph.html8
-rw-r--r--git-commit-graph.txt6
-rw-r--r--git.html4
-rw-r--r--git.txt2
-rw-r--r--gitremote-helpers.html6
-rw-r--r--gitremote-helpers.txt4
-rw-r--r--howto/keep-canonical-history-correct.html2
-rw-r--r--howto/maintain-git.html2
-rw-r--r--howto/new-command.html2
-rw-r--r--howto/rebase-from-internal-branch.html2
-rw-r--r--howto/rebuild-from-update-hook.html2
-rw-r--r--howto/recover-corrupted-blob-object.html2
-rw-r--r--howto/recover-corrupted-object-harder.html2
-rw-r--r--howto/revert-a-faulty-merge.html2
-rw-r--r--howto/revert-branch-rebase.html2
-rw-r--r--howto/separating-topic-branches.html2
-rw-r--r--howto/setup-git-server-over-http.html2
-rw-r--r--howto/update-hook-example.html2
-rw-r--r--howto/use-git-daemon.html2
-rw-r--r--howto/using-merge-subtree.html2
-rw-r--r--howto/using-signed-tag-in-pull-request.html2
-rw-r--r--technical/protocol-v2.html8
-rw-r--r--technical/protocol-v2.txt2
26 files changed, 79 insertions, 30 deletions
diff --git a/RelNotes/2.28.0.txt b/RelNotes/2.28.0.txt
index c386fc715..b1a23e94c 100644
--- a/RelNotes/2.28.0.txt
+++ b/RelNotes/2.28.0.txt
@@ -16,6 +16,8 @@ UI, Workflows & Features
* The commands in the "diff" family learned to honor "diff.relative"
configuration variable.
+ * The check in "git fsck" to ensure that the tree objects are sorted
+ still had corner cases it missed unsorted entries.
Performance, Internal Implementation, Development Support etc.
@@ -30,6 +32,17 @@ Performance, Internal Implementation, Development Support etc.
time. Start using -Wno-universal-initializer option to squelch
it (the latest sparse has it on by default).
+ * "git log -L..." now takes advantage of the "which paths are touched
+ by this commit?" info stored in the commit-graph system.
+
+ * As FreeBSD is not the only platform whose regexp library reports
+ a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
+ automatically and skip the affected tests.
+
+ * "git bugreport" learns to report what shell is in use.
+
+ * Support for GIT_CURL_VERBOSE has been rewritten in terms of
+ GIT_TRACE_CURL.
Fixes since v2.27
@@ -47,6 +60,24 @@ Fixes since v2.27
existing repositories as-is.
(merge d42a2fb72f en/fast-import-looser-date later to maint).
+ * The command line completion script (in contrib/) tried to complete
+ "git stash -p" as if it were "git stash push -p", but it was too
+ aggressive and also affected "git stash show -p", which has been
+ corrected.
+ (merge fffd0cf520 vs/complete-stash-show-p-fix later to maint).
+
+ * On-the-wire protocol v2 easily falls into a deadlock between the
+ remote-curl helper and the fetch-pack process when the server side
+ prematurely throws an error and disconnects. The communication has
+ been updated to make it more robust.
+
+ * "git checkout -p" did not handle a newly added path at all.
+ (merge 2c8bd8471a js/checkout-p-new-file later to maint).
+
+ * The code to parse "git bisect start" command line was lax in
+ validating the arguments.
+ (merge 4d9005ff5d cb/bisect-helper-parser-fix later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge 2c31a7aa44 jx/pkt-line-doc-count-fix later to maint).
(merge d63ae31962 cb/t5608-cleanup later to maint).
diff --git a/git-bugreport.html b/git-bugreport.html
index 36daf224a..b4120cfea 100644
--- a/git-bugreport.html
+++ b/git-bugreport.html
@@ -801,6 +801,11 @@ Compiler-specific info string
A list of enabled hooks
</p>
</li>
+<li>
+<p>
+$SHELL
+</p>
+</li>
</ul></div>
<div class="paragraph"><p>This tool is invoked via the typical Git setup process, which means that in some
cases, it might not be able to launch - for example, if a relevant config file
@@ -851,7 +856,7 @@ the kind of information listed above when manually asking for help.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-05-20 11:34:37 PDT
+ 2020-06-08 18:30:54 PDT
</div>
</div>
</body>
diff --git a/git-bugreport.txt b/git-bugreport.txt
index 9edad66a6..66e88c2e3 100644
--- a/git-bugreport.txt
+++ b/git-bugreport.txt
@@ -29,6 +29,7 @@ The following information is captured automatically:
- uname sysname, release, version, and machine strings
- Compiler-specific info string
- A list of enabled hooks
+ - $SHELL
This tool is invoked via the typical Git setup process, which means that in some
cases, it might not be able to launch - for example, if a relevant config file
diff --git a/git-commit-graph.html b/git-commit-graph.html
index 23cfa94d6..7be2b3a1f 100644
--- a/git-commit-graph.html
+++ b/git-commit-graph.html
@@ -808,8 +808,10 @@ walking objects only in the specified pack-indexes. (Cannot be combined
with <code>--stdin-commits</code> or <code>--reachable</code>.)</p></div>
<div class="paragraph"><p>With the <code>--stdin-commits</code> option, generate the new commit graph by
walking commits starting at the commits specified in stdin as a list
-of OIDs in hex, one OID per line. (Cannot be combined with
-<code>--stdin-packs</code> or <code>--reachable</code>.)</p></div>
+of OIDs in hex, one OID per line. OIDs that resolve to non-commits
+(either directly, or by peeling tags) are silently ignored. OIDs that
+are malformed, or do not exist generate an error. (Cannot be combined
+with <code>--stdin-packs</code> or <code>--reachable</code>.)</p></div>
<div class="paragraph"><p>With the <code>--reachable</code> option, generate the new commit graph by walking
commits starting at all refs. (Cannot be combined with <code>--stdin-commits</code>
or <code>--stdin-packs</code>.)</p></div>
@@ -927,7 +929,7 @@ Write a commit-graph file containing all commits in the current
<div id="footer">
<div id="footer-text">
Last updated
- 2020-05-26 11:29:03 PDT
+ 2020-06-08 18:30:54 PDT
</div>
</div>
</body>
diff --git a/git-commit-graph.txt b/git-commit-graph.txt
index a3d996787..8ca1764d3 100644
--- a/git-commit-graph.txt
+++ b/git-commit-graph.txt
@@ -47,8 +47,10 @@ with `--stdin-commits` or `--reachable`.)
+
With the `--stdin-commits` option, generate the new commit graph by
walking commits starting at the commits specified in stdin as a list
-of OIDs in hex, one OID per line. (Cannot be combined with
-`--stdin-packs` or `--reachable`.)
+of OIDs in hex, one OID per line. OIDs that resolve to non-commits
+(either directly, or by peeling tags) are silently ignored. OIDs that
+are malformed, or do not exist generate an error. (Cannot be combined
+with `--stdin-packs` or `--reachable`.)
+
With the `--reachable` option, generate the new commit graph by walking
commits starting at all refs. (Cannot be combined with `--stdin-commits`
diff --git a/git.html b/git.html
index 2e3d9e296..07595d461 100644
--- a/git.html
+++ b/git.html
@@ -3029,8 +3029,6 @@ of clones and fetches.</p></div>
Enables a curl full trace dump of all incoming and outgoing data,
including descriptive information, of the git transport protocol.
This is similar to doing curl <code>--trace-ascii</code> on the command line.
- This option overrides setting the <code>GIT_CURL_VERBOSE</code> environment
- variable.
See <code>GIT_TRACE</code> for available trace output options.
</p>
</dd>
@@ -3385,7 +3383,7 @@ the Git Security mailing list &lt;<a href="mailto:git-security@googlegroups.com"
<div id="footer">
<div id="footer-text">
Last updated
- 2020-05-31 13:02:02 PDT
+ 2020-06-08 18:30:54 PDT
</div>
</div>
</body>
diff --git a/git.txt b/git.txt
index 12890841c..40bd32f59 100644
--- a/git.txt
+++ b/git.txt
@@ -721,8 +721,6 @@ of clones and fetches.
Enables a curl full trace dump of all incoming and outgoing data,
including descriptive information, of the git transport protocol.
This is similar to doing curl `--trace-ascii` on the command line.
- This option overrides setting the `GIT_CURL_VERBOSE` environment
- variable.
See `GIT_TRACE` for available trace output options.
`GIT_TRACE_CURL_NO_DATA`::
diff --git a/gitremote-helpers.html b/gitremote-helpers.html
index 9f5686ad3..f6ce01e07 100644
--- a/gitremote-helpers.html
+++ b/gitremote-helpers.html
@@ -1247,7 +1247,9 @@ operations.</p></div>
trying to fall back). After line feed terminating the positive
(empty) response, the output of the service starts. Messages
(both request and response) must consist of zero or more
- PKT-LINEs, terminating in a flush packet. The client must not
+ PKT-LINEs, terminating in a flush packet. Response messages will
+ then have a response end packet after the flush packet to
+ indicate the end of a response. The client must not
expect the server to store any state in between request-response
pairs. After the connection ends, the remote helper exits.
</p>
@@ -1474,7 +1476,7 @@ set by Git if the remote helper has the <em>option</em> capability.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-06-08 18:30:54 PDT
</div>
</div>
</body>
diff --git a/gitremote-helpers.txt b/gitremote-helpers.txt
index f48a031dc..93baeeb02 100644
--- a/gitremote-helpers.txt
+++ b/gitremote-helpers.txt
@@ -405,7 +405,9 @@ Supported if the helper has the "connect" capability.
trying to fall back). After line feed terminating the positive
(empty) response, the output of the service starts. Messages
(both request and response) must consist of zero or more
- PKT-LINEs, terminating in a flush packet. The client must not
+ PKT-LINEs, terminating in a flush packet. Response messages will
+ then have a response end packet after the flush packet to
+ indicate the end of a response. The client must not
expect the server to store any state in between request-response
pairs. After the connection ends, the remote helper exits.
+
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 37d8309ad..dbe7be229 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:45 PDT
+ 2020-06-08 18:32:13 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 681e34684..d43e057f6 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:45 PDT
+ 2020-06-08 18:32:13 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index bb076ccb0..3dc9c4b38 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:39 PDT
+ 2020-06-08 18:32:08 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 1ea6effb9..c781d6e7f 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:45 PDT
+ 2020-06-08 18:32:12 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 5d9203c81..7d06f36a3 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:45 PDT
+ 2020-06-08 18:32:12 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index dae8ccdf2..f6ec46200 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:44 PDT
+ 2020-06-08 18:32:11 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 171ff8fed..9b5fd558c 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:44 PDT
+ 2020-06-08 18:32:12 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 70873a5f7..25f9a625c 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:43 PDT
+ 2020-06-08 18:32:11 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 3746dfd71..17a2b00fe 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:39 PDT
+ 2020-06-08 18:32:09 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 244b86fe3..79c43e77e 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:42 PDT
+ 2020-06-08 18:32:11 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 7a5741ade..87c8a5ca2 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:42 PDT
+ 2020-06-08 18:32:10 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 27d459738..45ffd76b0 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:41 PDT
+ 2020-06-08 18:32:10 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index cf33788e2..972f2020f 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:41 PDT
+ 2020-06-08 18:32:10 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 47827e1ce..d4e7e96c7 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:40 PDT
+ 2020-06-08 18:32:09 PDT
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 4f0c79fda..222d0f226 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-06-02 14:48:40 PDT
+ 2020-06-08 18:32:09 PDT
</div>
</div>
</body>
diff --git a/technical/protocol-v2.html b/technical/protocol-v2.html
index b18e5f757..4bcfb6ac2 100644
--- a/technical/protocol-v2.html
+++ b/technical/protocol-v2.html
@@ -803,6 +803,12 @@ commands be executed.</p></div>
<em>0001</em> Delimiter Packet (delim-pkt) - separates sections of a message
</p>
</li>
+<li>
+<p>
+<em>0002</em> Message Packet (response-end-pkt) - indicates the end of a response
+ for stateless connections
+</p>
+</li>
</ul></div>
</div>
</div>
@@ -1338,7 +1344,7 @@ a request.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-06-08 18:30:54 PDT
</div>
</div>
</body>
diff --git a/technical/protocol-v2.txt b/technical/protocol-v2.txt
index 7e3766caf..3996d7089 100644
--- a/technical/protocol-v2.txt
+++ b/technical/protocol-v2.txt
@@ -33,6 +33,8 @@ In protocol v2 these special packets will have the following semantics:
* '0000' Flush Packet (flush-pkt) - indicates the end of a message
* '0001' Delimiter Packet (delim-pkt) - separates sections of a message
+ * '0002' Message Packet (response-end-pkt) - indicates the end of a response
+ for stateless connections
Initial Client Request
----------------------