Skip to content

Commit d98465a

Browse files
gitstergitster
committed
Autogenerated HTML docs for v2.49.0-111-g5b97a5
1 parent 300c926 commit d98465a

14 files changed

+151
-53
lines changed

‎RelNotes/2.50.0.adoc

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,26 @@ Performance, Internal Implementation, Development Support etc.
1717
1818
* "git fsck" becomes more careful when checking the refs.
1919
20+
* "git fast-export | git fast-import" learns to deal with commit and
21+
tag objects with embedded signatures a bit better.
22+
23+
* The code paths to check whether a refname X is available (by seeing
24+
if another ref X/Y exists, etc.) have been optimized.
25+
26+
* First step of deprecating and removing merge-recursive.
27+
28+
* In protocol v2 where the refs advertisement is constrained, we try
29+
to tell the server side not to limit the advertisement when there
30+
is no specific need to, which has been the source of confusion and
31+
recent bugs. Revamp the logic to simplify.
32+
33+
* Update meson based build procedure for breaking changes support.
34+
35+
* Enable -Wunreachable-code for developer builds.
36+
37+
* Build update.
38+
(merge 7c8cd9c158 es/meson-building-docs-requires-perl later to maint).
39+
2040
2141
Fixes since v2.49
2242
-----------------
@@ -30,5 +50,19 @@ Fixes since v2.49
3050
when certain renames are involved.
3151
(merge 3adba40858 en/merge-process-renames-crash-fix later to maint).
3252

53+
* Certain "cruft" objects would have never been refreshed when there
54+
are multiple cruft packs in the repository, which has been
55+
corrected.
56+
(merge 08f612ba70 tb/multi-cruft-pack-refresh-fix later to maint).
57+
58+
* The xdiff code on 32-bit platform misbehaved when an insanely large
59+
context size is given, which has been corrected.
60+
(merge d39e28e68c rs/xdiff-context-length-fix later to maint).
61+
3362
* Other code cleanup, docfix, build fix, etc.
3463
(merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint).
64+
(merge 2bfd3b3685 ab/decorate-code-cleanup later to maint).
65+
(merge 5337daddc7 am/dir-dedup-decl-of-repository later to maint).
66+
(merge 554051d691 en/diff-rename-follow-fix later to maint).
67+
(merge a18c18b470 en/random-cleanups later to maint).
68+
(merge 5af21c9acb hj/doc-rev-list-ancestry-fix later to maint).

‎git-fast-export.adoc

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,33 @@ OPTIONS
2727
Insert 'progress' statements every <n> objects, to be shown by
2828
'git fast-import' during import.
2929

30-
--signed-tags=(verbatim|warn|warn-strip|strip|abort)::
30+
--signed-tags=(verbatim|warn-verbatim|warn-strip|strip|abort)::
3131
Specify how to handle signed tags. Since any transformation
32-
after the export can change the tag names (which can also happen
33-
when excluding revisions) the signatures will not match.
32+
after the export (or during the export, such as excluding
33+
revisions) can change the hashes being signed, the signatures
34+
may become invalid.
3435
+
3536
When asking to 'abort' (which is the default), this program will die
3637
when encountering a signed tag. With 'strip', the tags will silently
3738
be made unsigned, with 'warn-strip' they will be made unsigned but a
3839
warning will be displayed, with 'verbatim', they will be silently
39-
exported and with 'warn', they will be exported, but you will see a
40-
warning.
40+
exported and with 'warn-verbatim' (or 'warn', a deprecated synonym),
41+
they will be exported, but you will see a warning. 'verbatim' and
42+
'warn-verbatim' should only be used if you know that no transformation
43+
affecting tags or any commit in their history will be performed by you
44+
or by fast-export or fast-import, or if you do not care that the
45+
resulting tag will have an invalid signature.
46+
47+
--signed-commits=(verbatim|warn-verbatim|warn-strip|strip|abort)::
48+
Specify how to handle signed commits. Behaves exactly as
49+
'--signed-tags', but for commits. Default is 'abort'.
50+
+
51+
Earlier versions this command that did not have '--signed-commits'
52+
behaved as if '--signed-commits=strip'. As an escape hatch for users
53+
of tools that call 'git fast-export' but do not yet support
54+
'--signed-commits', you may set the environment variable
55+
'FAST_EXPORT_SIGNED_COMMITS_NOABORT=1' in order to change the default
56+
from 'abort' to 'warn-strip'.
4157

4258
--tag-of-filtered-object=(abort|drop|rewrite)::
4359
Specify how to handle tags whose tagged object is filtered out.

‎git-fast-export.html

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,18 +481,36 @@ <h2 id="_options">OPTIONS</h2>
481481
<p>Insert <em>progress</em> statements every &lt;n&gt; objects, to be shown by
482482
<em>git fast-import</em> during import.</p>
483483
</dd>
484-
<dt class="hdlist1">--signed-tags=(verbatim|warn|warn-strip|strip|abort)</dt>
484+
<dt class="hdlist1">--signed-tags=(verbatim|warn-verbatim|warn-strip|strip|abort)</dt>
485485
<dd>
486486
<p>Specify how to handle signed tags. Since any transformation
487-
after the export can change the tag names (which can also happen
488-
when excluding revisions) the signatures will not match.</p>
487+
after the export (or during the export, such as excluding
488+
revisions) can change the hashes being signed, the signatures
489+
may become invalid.</p>
489490
<div class="paragraph">
490491
<p>When asking to <em>abort</em> (which is the default), this program will die
491492
when encountering a signed tag. With <em>strip</em>, the tags will silently
492493
be made unsigned, with <em>warn-strip</em> they will be made unsigned but a
493494
warning will be displayed, with <em>verbatim</em>, they will be silently
494-
exported and with <em>warn</em>, they will be exported, but you will see a
495-
warning.</p>
495+
exported and with <em>warn-verbatim</em> (or <em>warn</em>, a deprecated synonym),
496+
they will be exported, but you will see a warning. <em>verbatim</em> and
497+
<em>warn-verbatim</em> should only be used if you know that no transformation
498+
affecting tags or any commit in their history will be performed by you
499+
or by fast-export or fast-import, or if you do not care that the
500+
resulting tag will have an invalid signature.</p>
501+
</div>
502+
</dd>
503+
<dt class="hdlist1">--signed-commits=(verbatim|warn-verbatim|warn-strip|strip|abort)</dt>
504+
<dd>
505+
<p>Specify how to handle signed commits. Behaves exactly as
506+
<em>--signed-tags</em>, but for commits. Default is <em>abort</em>.</p>
507+
<div class="paragraph">
508+
<p>Earlier versions this command that did not have <em>--signed-commits</em>
509+
behaved as if <em>--signed-commits=strip</em>. As an escape hatch for users
510+
of tools that call <em>git fast-export</em> but do not yet support
511+
<em>--signed-commits</em>, you may set the environment variable
512+
<em>FAST_EXPORT_SIGNED_COMMITS_NOABORT=1</em> in order to change the default
513+
from <em>abort</em> to <em>warn-strip</em>.</p>
496514
</div>
497515
</dd>
498516
<dt class="hdlist1">--tag-of-filtered-object=(abort|drop|rewrite)</dt>
@@ -798,7 +816,7 @@ <h2 id="_git">GIT</h2>
798816
</div>
799817
<div id="footer">
800818
<div id="footer-text">
801-
Last updated 2025-02-14 21:38:14 -0800
819+
Last updated 2025-03-29 17:09:47 +0900
802820
</div>
803821
</div>
804822
</body>

‎git-fast-import.adoc

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,13 +431,22 @@ and control the current import process. More detailed discussion
431431
Create or update a branch with a new commit, recording one logical
432432
change to the project.
433433

434+
////
435+
Yes, it's intentional that the 'gpgsig' line doesn't have a trailing
436+
`LF`; the definition of `data` has a byte-count prefix, so it
437+
doesn't need an `LF` to act as a terminator (and `data` also already
438+
includes an optional trailing `LF?` just in case you want to include
439+
one).
440+
////
441+
434442
....
435443
'commit' SP <ref> LF
436444
mark?
437445
original-oid?
438446
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
439447
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
440-
('encoding' SP <encoding>)?
448+
('gpgsig' SP <alg> LF data)?
449+
('encoding' SP <encoding> LF)?
441450
data
442451
('from' SP <commit-ish> LF)?
443452
('merge' SP <commit-ish> LF)*
@@ -505,6 +514,15 @@ that was selected by the --date-format=<fmt> command-line option.
505514
See ``Date Formats'' above for the set of supported formats, and
506515
their syntax.
507516

517+
`gpgsig`
518+
^^^^^^^^
519+
520+
The optional `gpgsig` command is used to include a PGP/GPG signature
521+
that signs the commit data.
522+
523+
Here <alg> specifies which hashing algorithm is used for this
524+
signature, either `sha1` or `sha256`.
525+
508526
`encoding`
509527
^^^^^^^^^^
510528
The optional `encoding` command indicates the encoding of the commit

‎git-fast-import.html

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,8 @@ <h3 id="_commit"><code>commit</code></h3>
998998
original-oid?
999999
('author' (SP &lt;name&gt;)? SP LT &lt;email&gt; GT SP &lt;when&gt; LF)?
10001000
'committer' (SP &lt;name&gt;)? SP LT &lt;email&gt; GT SP &lt;when&gt; LF
1001-
('encoding' SP &lt;encoding&gt;)?
1001+
('gpgsig' SP &lt;alg&gt; LF data)?
1002+
('encoding' SP &lt;encoding&gt; LF)?
10021003
data
10031004
('from' SP &lt;commit-ish&gt; LF)?
10041005
('merge' SP &lt;commit-ish&gt; LF)*
@@ -1078,6 +1079,17 @@ <h4 id="_committer"><code>committer</code></h4>
10781079
</div>
10791080
</div>
10801081
<div class="sect3">
1082+
<h4 id="_gpgsig"><code>gpgsig</code></h4>
1083+
<div class="paragraph">
1084+
<p>The optional <code>gpgsig</code> command is used to include a PGP/GPG signature
1085+
that signs the commit data.</p>
1086+
</div>
1087+
<div class="paragraph">
1088+
<p>Here &lt;alg&gt; specifies which hashing algorithm is used for this
1089+
signature, either <code>sha1</code> or <code>sha256</code>.</p>
1090+
</div>
1091+
</div>
1092+
<div class="sect3">
10811093
<h4 id="_encoding"><code>encoding</code></h4>
10821094
<div class="paragraph">
10831095
<p>The optional <code>encoding</code> command indicates the encoding of the commit
@@ -2547,7 +2559,7 @@ <h2 id="_git">GIT</h2>
25472559
</div>
25482560
<div id="footer">
25492561
<div id="footer-text">
2550-
Last updated 2025-02-14 21:38:14 -0800
2562+
Last updated 2025-03-29 17:09:47 +0900
25512563
</div>
25522564
</div>
25532565
</body>

‎git-log.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ <h3 id="_history_simplification">History Simplification</h3>
14371437
<div class="content">
14381438
<pre> E
14391439
\
1440-
G---H---I---J
1440+
C---G---H---I---J
14411441
\
14421442
L--M</pre>
14431443
</div>
@@ -4405,7 +4405,7 @@ <h2 id="_git">GIT</h2>
44054405
</div>
44064406
<div id="footer">
44074407
<div id="footer-text">
4408-
Last updated 2025-02-14 21:38:14 -0800
4408+
Last updated 2025-02-15 14:38:14 +0900
44094409
</div>
44104410
</div>
44114411
</body>

‎git-merge.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,12 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
12611261
<dd>
12621262
<p>Deprecated synonym for <code>find-renames=</code><em>&lt;n&gt;</em>.</p>
12631263
</dd>
1264+
<dt class="hdlist1">no-renames</dt>
1265+
<dd>
1266+
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
1267+
configuration variable.
1268+
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.</p>
1269+
</dd>
12641270
<dt class="hdlist1">subtree[=&lt;path&gt;]</dt>
12651271
<dd>
12661272
<p>This option is a more advanced form of <em>subtree</em> strategy, where
@@ -1292,7 +1298,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
12921298
</div>
12931299
<div class="paragraph">
12941300
<p>The <em>recursive</em> strategy takes the same options as <em>ort</em>. However,
1295-
there are three additional options that <em>ort</em> ignores (not documented
1301+
there are two additional options that <em>ort</em> ignores (not documented
12961302
above) that are potentially useful with the <em>recursive</em> strategy:</p>
12971303
</div>
12981304
<div class="dlist">
@@ -1310,12 +1316,6 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
13101316
specifically uses <code>diff-algorithm=histogram</code>, while <code>recursive</code>
13111317
defaults to the <code>diff.algorithm</code> config setting.</p>
13121318
</dd>
1313-
<dt class="hdlist1">no-renames</dt>
1314-
<dd>
1315-
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
1316-
configuration variable.
1317-
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.</p>
1318-
</dd>
13191319
</dl>
13201320
</div>
13211321
</dd>
@@ -1718,7 +1718,7 @@ <h2 id="_git">GIT</h2>
17181718
</div>
17191719
<div id="footer">
17201720
<div id="footer-text">
1721-
Last updated 2025-02-14 21:38:14 -0800
1721+
Last updated 2025-02-15 14:38:14 +0900
17221722
</div>
17231723
</div>
17241724
</body>

‎git-pull.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,6 +1592,12 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
15921592
<dd>
15931593
<p>Deprecated synonym for <code>find-renames=</code><em>&lt;n&gt;</em>.</p>
15941594
</dd>
1595+
<dt class="hdlist1">no-renames</dt>
1596+
<dd>
1597+
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
1598+
configuration variable.
1599+
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.</p>
1600+
</dd>
15951601
<dt class="hdlist1">subtree[=&lt;path&gt;]</dt>
15961602
<dd>
15971603
<p>This option is a more advanced form of <em>subtree</em> strategy, where
@@ -1623,7 +1629,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
16231629
</div>
16241630
<div class="paragraph">
16251631
<p>The <em>recursive</em> strategy takes the same options as <em>ort</em>. However,
1626-
there are three additional options that <em>ort</em> ignores (not documented
1632+
there are two additional options that <em>ort</em> ignores (not documented
16271633
above) that are potentially useful with the <em>recursive</em> strategy:</p>
16281634
</div>
16291635
<div class="dlist">
@@ -1641,12 +1647,6 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
16411647
specifically uses <code>diff-algorithm=histogram</code>, while <code>recursive</code>
16421648
defaults to the <code>diff.algorithm</code> config setting.</p>
16431649
</dd>
1644-
<dt class="hdlist1">no-renames</dt>
1645-
<dd>
1646-
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
1647-
configuration variable.
1648-
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.</p>
1649-
</dd>
16501650
</dl>
16511651
</div>
16521652
</dd>
@@ -1887,7 +1887,7 @@ <h2 id="_git">GIT</h2>
18871887
</div>
18881888
<div id="footer">
18891889
<div id="footer-text">
1890-
Last updated 2025-02-14 21:38:14 -0800
1890+
Last updated 2025-02-15 14:38:14 +0900
18911891
</div>
18921892
</div>
18931893
</body>

‎git-rebase.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,12 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
16491649
<dd>
16501650
<p>Deprecated synonym for <code>find-renames=</code><em>&lt;n&gt;</em>.</p>
16511651
</dd>
1652+
<dt class="hdlist1">no-renames</dt>
1653+
<dd>
1654+
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
1655+
configuration variable.
1656+
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.</p>
1657+
</dd>
16521658
<dt class="hdlist1">subtree[=&lt;path&gt;]</dt>
16531659
<dd>
16541660
<p>This option is a more advanced form of <em>subtree</em> strategy, where
@@ -1680,7 +1686,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
16801686
</div>
16811687
<div class="paragraph">
16821688
<p>The <em>recursive</em> strategy takes the same options as <em>ort</em>. However,
1683-
there are three additional options that <em>ort</em> ignores (not documented
1689+
there are two additional options that <em>ort</em> ignores (not documented
16841690
above) that are potentially useful with the <em>recursive</em> strategy:</p>
16851691
</div>
16861692
<div class="dlist">
@@ -1698,12 +1704,6 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
16981704
specifically uses <code>diff-algorithm=histogram</code>, while <code>recursive</code>
16991705
defaults to the <code>diff.algorithm</code> config setting.</p>
17001706
</dd>
1701-
<dt class="hdlist1">no-renames</dt>
1702-
<dd>
1703-
<p>Turn off rename detection. This overrides the <code>merge.renames</code>
1704-
configuration variable.
1705-
See also <a href="git-diff.html">git-diff(1)</a> <code>--no-renames</code>.</p>
1706-
</dd>
17071707
</dl>
17081708
</div>
17091709
</dd>
@@ -2496,7 +2496,7 @@ <h2 id="_git">GIT</h2>
24962496
</div>
24972497
<div id="footer">
24982498
<div id="footer-text">
2499-
Last updated 2025-02-25 15:22:04 -0800
2499+
Last updated 2025-03-26 16:41:02 +0900
25002500
</div>
25012501
</div>
25022502
</body>

‎git-replay.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ <h3 id="_history_simplification">History Simplification</h3>
12661266
<div class="content">
12671267
<pre> E
12681268
\
1269-
G---H---I---J
1269+
C---G---H---I---J
12701270
\
12711271
L--M</pre>
12721272
</div>
@@ -1912,7 +1912,7 @@ <h2 id="_git">GIT</h2>
19121912
</div>
19131913
<div id="footer">
19141914
<div id="footer-text">
1915-
Last updated 2025-02-14 21:38:14 -0800
1915+
Last updated 2025-02-15 14:38:14 +0900
19161916
</div>
19171917
</div>
19181918
</body>

0 commit comments

Comments
 (0)