Skip to content

Commit 510d706

Browse files
committed
Autogenerated HTML docs for v2.51.0-315-gbb697
1 parent 7a5b4fd commit 510d706

11 files changed

+367
-64
lines changed

BreakingChanges.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,11 @@ These features will be removed.
239239
+
240240
The command will be removed.
241241

242+
* Support for `core.commentString=auto` has been deprecated and will
243+
be removed in Git 3.0.
244+
+
245+
cf. <xmqqa59i45wc.fsf@gitster.g>
246+
242247
== Superseded features that will not be deprecated
243248

244249
Some features have gained newer replacements that aim to improve the design in

BreakingChanges.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,13 @@ <h3 id="_removals">Removals</h3>
787787
<p>The command will be removed.</p>
788788
</div>
789789
</li>
790+
<li>
791+
<p>Support for <code>core.commentString=auto</code> has been deprecated and will
792+
be removed in Git 3.0.</p>
793+
<div class="paragraph">
794+
<p>cf. &lt;xmqqa59i45wc.fsf@gitster.g&gt;</p>
795+
</div>
796+
</li>
790797
</ul>
791798
</div>
792799
</div>
@@ -825,7 +832,7 @@ <h2 id="_superseded_features_that_will_not_be_deprecated">Superseded features th
825832
</div>
826833
<div id="footer">
827834
<div id="footer-text">
828-
Last updated 2025-07-14 12:11:05 -0700
835+
Last updated 2025-09-23 13:59:22 -0700
829836
</div>
830837
</div>
831838
</body>

RelNotes/2.52.0.adoc

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ UI, Workflows & Features
2424
"--format=nul", and learns to report the objects format used in the
2525
repository.
2626

27+
* "core.commentChar=auto" that attempts to dynamically pick a
28+
suitable comment character is non-workable, as it is too much
29+
trouble to support for little benefit, and is marked as deprecated.
30+
31+
* "git send-email" learned to drive "git imap-send" to store already
32+
sent e-mails in an IMAP folder.
33+
34+
* The "promisor-remote" capability mechanism has been updated to
35+
allow the "partialCloneFilter" settings and the "token" value to be
36+
communicated from the server side.
37+
2738

2839
Performance, Internal Implementation, Development Support etc.
2940
--------------------------------------------------------------
@@ -63,6 +74,19 @@ Performance, Internal Implementation, Development Support etc.
6374
singleton variable, which has been updated to pass an instance
6475
throughout the callchain.
6576
77+
* CodingGuidelines now spells out how bitfields are to be written.
78+
79+
* Adjust to the way newer versions of cURL selectivel enables tracing
80+
options, so that our tests can continue to work.
81+
(merge 1b5a6bfff3 jk/curl-global-trace-components later to maint).
82+
83+
* The clear_alloc_state() API function was not fully clearing the
84+
structure for reuse, but since nobody reuses it, replace it with a
85+
variant that frees the structure as well, making the callers simpler.
86+
87+
* "git range-diff" learned a way to limit the memory consumed by
88+
O(N*N) cost matrix.
89+
6690
6791
Fixes since v2.51
6892
-----------------
@@ -177,6 +201,22 @@ including security updates, are included in this release.
177201
exhaust memory storing them redundantly, which has been corrected.
178202
(merge 88a2dc68c8 ps/upload-pack-oom-protection later to maint).
179203

204+
* A corner case bug in "git log -L..." has been corrected.
205+
(merge e3106998ff sg/line-log-boundary-fixes later to maint).
206+
207+
* "git rev-parse --short" and friends failed to disambiguate two
208+
objects with object names that share common prefix longer than 32
209+
characters, which has been fixed.
210+
(merge 8655908b9e jc/longer-disambiguation-fix later to maint).
211+
212+
* Some among "git add -p" and friends ignored color.diff and/or
213+
color.ui configuration variables, which is an old regression, which
214+
has been corrected.
215+
(merge 1092cd6435 jk/add-i-color later to maint).
216+
217+
* "git subtree" (in contrib/) did not work correctly when splitting
218+
squashed subtrees, which has been improved.
219+
180220
* Other code cleanup, docfix, build fix, etc.
181221
(merge 823d537fa7 kh/doc-git-log-markup-fix later to maint).
182222
(merge cf7efa4f33 rj/t6137-cygwin-fix later to maint).
@@ -198,3 +238,7 @@ including security updates, are included in this release.
198238
(merge c25651aefd ds/midx-write-fixes later to maint).
199239
(merge 069c15d256 rs/object-name-extend-abbrev-len-update later to maint).
200240
(merge bf5c224537 mm/worktree-doc-typofix later to maint).
241+
(merge 31397bc4f7 kh/doc-fast-import-markup-fix later to maint).
242+
(merge ac7096723b jc/doc-includeif-hasconfig-remote-url-fix later to maint).
243+
(merge fafc9b08b8 ag/doc-sendmail-gmail-example-update later to maint).
244+
(merge a66fc22bf9 rs/get-oid-with-flags-cleanup later to maint).

config.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ whose format and meaning depends on the keyword. Supported keywords
114114
are:
115115

116116
`gitdir`::
117-
118-
The data that follows the keyword `gitdir:` is used as a glob
117+
The data that follows the keyword `gitdir` and a colon is used as a glob
119118
pattern. If the location of the .git directory matches the
120119
pattern, the include condition is met.
121120
+
@@ -148,7 +147,7 @@ refer to linkgit:gitignore[5] for details. For convenience:
148147
case-insensitively (e.g. on case-insensitive file systems)
149148

150149
`onbranch`::
151-
The data that follows the keyword `onbranch:` is taken to be a
150+
The data that follows the keyword `onbranch` and a colon is taken to be a
152151
pattern with standard globbing wildcards and two additional
153152
ones, `**/` and `/**`, that can match multiple path components.
154153
If we are in a worktree where the name of the branch that is
@@ -161,8 +160,8 @@ all branches that begin with `foo/`. This is useful if your branches are
161160
organized hierarchically and you would like to apply a configuration to
162161
all the branches in that hierarchy.
163162

164-
`hasconfig:remote.*.url:`::
165-
The data that follows this keyword is taken to
163+
`hasconfig:remote.*.url`::
164+
The data that follows this keyword and a colon is taken to
166165
be a pattern with standard globbing wildcards and two
167166
additional ones, `**/` and `/**`, that can match multiple
168167
components. The first time this keyword is seen, the rest of

git-config.html

Lines changed: 119 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ <h3 id="_conditional_includes">Conditional includes</h3>
14051405
<dl>
14061406
<dt class="hdlist1"><code>gitdir</code></dt>
14071407
<dd>
1408-
<p>The data that follows the keyword <code>gitdir:</code> is used as a glob
1408+
<p>The data that follows the keyword <code>gitdir</code> and a colon is used as a glob
14091409
pattern. If the location of the .git directory matches the
14101410
pattern, the include condition is met.</p>
14111411
<div class="paragraph">
@@ -1450,7 +1450,7 @@ <h3 id="_conditional_includes">Conditional includes</h3>
14501450
</dd>
14511451
<dt class="hdlist1"><code>onbranch</code></dt>
14521452
<dd>
1453-
<p>The data that follows the keyword <code>onbranch:</code> is taken to be a
1453+
<p>The data that follows the keyword <code>onbranch</code> and a colon is taken to be a
14541454
pattern with standard globbing wildcards and two additional
14551455
ones, <code>**/</code> and <code>/**</code>, that can match multiple path components.
14561456
If we are in a worktree where the name of the branch that is
@@ -1464,9 +1464,9 @@ <h3 id="_conditional_includes">Conditional includes</h3>
14641464
all the branches in that hierarchy.</p>
14651465
</div>
14661466
</dd>
1467-
<dt class="hdlist1"><code>hasconfig:remote.*.url:</code></dt>
1467+
<dt class="hdlist1"><code>hasconfig:remote.*.url</code></dt>
14681468
<dd>
1469-
<p>The data that follows this keyword is taken to
1469+
<p>The data that follows this keyword and a colon is taken to
14701470
be a pattern with standard globbing wildcards and two
14711471
additional ones, <code>**/</code> and <code>/**</code>, that can match multiple
14721472
components. The first time this keyword is seen, the rest of
@@ -3622,8 +3622,35 @@ <h3 id="_variables">Variables</h3>
36223622
commented, and removes them after the editor returns
36233623
(default <em>#</em>).</p>
36243624
<div class="paragraph">
3625-
<p>If set to "auto", <code>git-commit</code> would select a character that is not
3626-
the beginning character of any line in existing commit messages.</p>
3625+
<p>If set to "auto", <code>git-commit</code> will select a character that is not
3626+
the beginning character of any line in existing commit messages.
3627+
Support for this value is deprecated and will be removed in Git 3.0
3628+
due to the following limitations:</p>
3629+
</div>
3630+
<div class="openblock">
3631+
<div class="content">
3632+
<div class="ulist">
3633+
<ul>
3634+
<li>
3635+
<p>It is incompatible with adding comments in a commit message
3636+
template. This includes the conflicts comments added to
3637+
the commit message by <code>cherry-pick</code>, <code>merge</code>, <code>rebase</code> and
3638+
<code>revert</code>.</p>
3639+
</li>
3640+
<li>
3641+
<p>It is incompatible with adding comments to the commit message
3642+
in the <code>prepare-commit-msg</code> hook.</p>
3643+
</li>
3644+
<li>
3645+
<p>It is incompatible with the <code>fixup</code> and <code>squash</code> commands when
3646+
rebasing,</p>
3647+
</li>
3648+
<li>
3649+
<p>It is not respected by <code>git</code> <code>notes</code></p>
3650+
</li>
3651+
</ul>
3652+
</div>
3653+
</div>
36273654
</div>
36283655
<div class="paragraph">
36293656
<p>Note that these two variables are aliases of each other, and in modern
@@ -7601,6 +7628,35 @@ <h3 id="_variables">Variables</h3>
76017628
"false", which means the "promisor-remote" capability is not
76027629
advertised.</p>
76037630
</dd>
7631+
<dt class="hdlist1">promisor.sendFields</dt>
7632+
<dd>
7633+
<p>A comma or space separated list of additional remote related
7634+
field names. A server sends these field names and the
7635+
associated field values from its configuration when
7636+
advertising its promisor remotes using the "promisor-remote"
7637+
capability, see <a href="gitprotocol-v2.html">gitprotocol-v2(5)</a>. Currently, only the
7638+
"partialCloneFilter" and "token" field names are supported.</p>
7639+
</dd>
7640+
<dt class="hdlist1"><code>partialCloneFilter</code></dt>
7641+
<dd>
7642+
<p>contains the partial clone filter
7643+
used for the remote.</p>
7644+
</dd>
7645+
<dt class="hdlist1"><code>token</code></dt>
7646+
<dd>
7647+
<p>contains an authentication token for the remote.</p>
7648+
<div class="paragraph">
7649+
<p>When a field name is part of this list and a corresponding
7650+
"remote.foo.&lt;field-name&gt;" config variable is set on the server to a
7651+
non-empty value, then the field name and value are sent when
7652+
advertising the promisor remote "foo".</p>
7653+
</div>
7654+
<div class="paragraph">
7655+
<p>This list has no effect unless the "promisor.advertise" config
7656+
variable is set to "true", and the "name" and "url" fields are always
7657+
advertised regardless of this setting.</p>
7658+
</div>
7659+
</dd>
76047660
<dt class="hdlist1">promisor.acceptFromServer</dt>
76057661
<dd>
76067662
<p>If set to "all", a client will accept all the promisor remotes
@@ -7622,6 +7678,61 @@ <h3 id="_variables">Variables</h3>
76227678
to "fetch" and "clone" requests from the client. Name and URL
76237679
comparisons are case sensitive. See <a href="gitprotocol-v2.html">gitprotocol-v2(5)</a>.</p>
76247680
</dd>
7681+
<dt class="hdlist1">promisor.checkFields</dt>
7682+
<dd>
7683+
<p>A comma or space separated list of additional remote related
7684+
field names. A client checks if the values of these fields
7685+
transmitted by a server correspond to the values of these
7686+
fields in its own configuration before accepting a promisor
7687+
remote. Currently, "partialCloneFilter" and "token" are the
7688+
only supported field names.</p>
7689+
<div class="paragraph">
7690+
<p>If one of these field names (e.g., "token") is being checked for an
7691+
advertised promisor remote (e.g., "foo"), three conditions must be met
7692+
for the check of this specific field to pass:</p>
7693+
</div>
7694+
<div class="olist arabic">
7695+
<ol class="arabic">
7696+
<li>
7697+
<p>The corresponding local configuration (e.g., <code>remote.foo.token</code>)
7698+
must be set.</p>
7699+
</li>
7700+
<li>
7701+
<p>The server must advertise the "token" field for remote "foo".</p>
7702+
</li>
7703+
<li>
7704+
<p>The value of the locally configured <code>remote.foo.token</code> must exactly
7705+
match the value advertised by the server for the "token" field.</p>
7706+
<div class="paragraph">
7707+
<p>If any of these conditions is not met for any field name listed in
7708+
<code>promisor.checkFields</code>, the advertised remote "foo" is rejected.</p>
7709+
</div>
7710+
<div class="paragraph">
7711+
<p>For the "partialCloneFilter" field, this allows the client to ensure
7712+
that the server&#8217;s filter matches what it expects locally, preventing
7713+
inconsistencies in filtering behavior. For the "token" field, this can
7714+
be used to verify that authentication credentials match expected
7715+
values.</p>
7716+
</div>
7717+
<div class="paragraph">
7718+
<p>Field values are compared case-sensitively.</p>
7719+
</div>
7720+
<div class="paragraph">
7721+
<p>The "name" and "url" fields are always checked according to the
7722+
<code>promisor.acceptFromServer</code> policy, independently of this setting.</p>
7723+
</div>
7724+
<div class="paragraph">
7725+
<p>The field names and values should be passed by the server through the
7726+
"promisor-remote" capability by using the <code>promisor.sendFields</code> config
7727+
variable. The fields are checked only if the
7728+
<code>promisor.acceptFromServer</code> config variable is not set to "None". If
7729+
set to "None", this config variable has no effect. See
7730+
<a href="gitprotocol-v2.html">gitprotocol-v2(5)</a>.</p>
7731+
</div>
7732+
</li>
7733+
</ol>
7734+
</div>
7735+
</dd>
76257736
<dt class="hdlist1">protocol.allow</dt>
76267737
<dd>
76277738
<p>If set, provide a user defined default policy for all protocols which
@@ -8705,6 +8816,8 @@ <h3 id="_variables">Variables</h3>
87058816
<dt class="hdlist1">sendemail.smtpServerPort</dt>
87068817
<dt class="hdlist1">sendemail.smtpServerOption</dt>
87078818
<dt class="hdlist1">sendemail.smtpUser</dt>
8819+
<dt class="hdlist1">sendemail.imapSentFolder</dt>
8820+
<dt class="hdlist1">sendemail.useImapOnly</dt>
87088821
<dt class="hdlist1">sendemail.thread</dt>
87098822
<dt class="hdlist1">sendemail.transferEncoding</dt>
87108823
<dt class="hdlist1">sendemail.validate</dt>

git-fast-import.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ OPTIONS
6161
currently impacts only the `export-marks`, `import-marks`, and
6262
`import-marks-if-exists` feature commands.
6363
+
64-
Only enable this option if you trust the program generating the
65-
fast-import stream! This option is enabled automatically for
66-
remote-helpers that use the `import` capability, as they are
67-
already trusted to run their own code.
64+
Only enable this option if you trust the program generating the
65+
fast-import stream! This option is enabled automatically for
66+
remote-helpers that use the `import` capability, as they are
67+
already trusted to run their own code.
6868

6969
Options for Frontends
7070
~~~~~~~~~~~~~~~~~~~~~

git-fast-import.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,11 @@ <h2 id="_options">OPTIONS</h2>
516516
allowed by providing this option on the command line. This
517517
currently impacts only the <code>export-marks</code>, <code>import-marks</code>, and
518518
<code>import-marks-if-exists</code> feature commands.</p>
519-
<div class="literalblock">
520-
<div class="content">
521-
<pre>Only enable this option if you trust the program generating the
519+
<div class="paragraph">
520+
<p>Only enable this option if you trust the program generating the
522521
fast-import stream! This option is enabled automatically for
523-
remote-helpers that use the `import` capability, as they are
524-
already trusted to run their own code.</pre>
525-
</div>
522+
remote-helpers that use the <code>import</code> capability, as they are
523+
already trusted to run their own code.</p>
526524
</div>
527525
</dd>
528526
</dl>
@@ -2609,7 +2607,7 @@ <h2 id="_git">GIT</h2>
26092607
</div>
26102608
<div id="footer">
26112609
<div id="footer-text">
2612-
Last updated 2025-09-12 12:13:52 -0700
2610+
Last updated 2025-09-23 13:59:22 -0700
26132611
</div>
26142612
</div>
26152613
</body>

0 commit comments

Comments
 (0)