Skip to content

Commit 2e6660d

Browse files
committed
Autogenerated HTML docs for v2.51.0-511-gac7d0
1 parent b693814 commit 2e6660d

File tree

9 files changed

+51
-27
lines changed

9 files changed

+51
-27
lines changed

RelNotes/2.52.0.adoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,16 @@ including security updates, are included in this release.
298298
* Handling of an empty subdirectory of .git/refs/ in the ref-files
299299
backend has been corrected.
300300

301+
* Our CI script requires "sudo" that can be told to preserve
302+
environment, but Ubuntu replaced with "sudo" with an implementation
303+
that lacks the feature. Work this around by reinstalling the
304+
original version.
305+
(merge fddb484255 ps/ci-avoid-broken-sudo-on-ubuntu later to maint).
306+
307+
* The reftable backend learned to sanity check its on-disk data more
308+
carefully.
309+
(merge 466a3a1afd kn/reftable-consistency-checks later to maint).
310+
301311
* Other code cleanup, docfix, build fix, etc.
302312
(merge 823d537fa7 kh/doc-git-log-markup-fix later to maint).
303313
(merge cf7efa4f33 rj/t6137-cygwin-fix later to maint).
@@ -326,3 +336,4 @@ including security updates, are included in this release.
326336
(merge e1d062e8ba ps/odb-clean-stale-wrappers later to maint).
327337
(merge fdd21ba116 mh/doc-credential-url-prefix later to maint).
328338
(merge 1c573a3451 en/doc-merge-tree-describe-merge-base later to maint).
339+
(merge 84a6bf7965 ja/doc-markup-attached-paragraph-fix later to maint).

fsck-msgids.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
`badReferentName`::
3939
(ERROR) The referent name of a symref is invalid.
4040

41+
`badReftableTableName`::
42+
(WARN) A reftable table has an invalid name.
43+
4144
`badTagName`::
4245
(INFO) A tag has an invalid format.
4346

@@ -104,9 +107,6 @@
104107
`gitmodulesParse`::
105108
(INFO) Could not parse `.gitmodules` blob.
106109

107-
`gitmodulesLarge`;
108-
(ERROR) `.gitmodules` blob is too large to parse.
109-
110110
`gitmodulesPath`::
111111
(ERROR) `.gitmodules` path is invalid.
112112

git-config.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4518,8 +4518,6 @@ <h3 id="_variables">Variables</h3>
45184518
<p>Unless otherwise stated, is an error to specify an extension if
45194519
<code>core.repositoryFormatVersion</code> is not <code>1</code>. See
45204520
<a href="gitrepository-layout.html">gitrepository-layout(5)</a>.</p>
4521-
<div class="openblock">
4522-
<div class="content">
45234521
<div class="dlist">
45244522
<dl>
45254523
<dt class="hdlist1">compatObjectFormat</dt>
@@ -4590,6 +4588,8 @@ <h3 id="_variables">Variables</h3>
45904588
<dt class="hdlist1">refStorage</dt>
45914589
<dd>
45924590
<p>Specify the ref storage format to use. The acceptable values are:</p>
4591+
<div class="openblock">
4592+
<div class="content">
45934593
<div class="ulist">
45944594
<ul>
45954595
<li>
@@ -4601,6 +4601,8 @@ <h3 id="_variables">Variables</h3>
46014601
</li>
46024602
</ul>
46034603
</div>
4604+
</div>
4605+
</div>
46044606
<div class="paragraph">
46054607
<p>Note that this setting should only be set by <a href="git-init.html">git-init(1)</a> or
46064608
<a href="git-clone.html">git-clone(1)</a>. Trying to change it after initialization will not
@@ -4629,6 +4631,8 @@ <h3 id="_variables">Variables</h3>
46294631
certain values from the common config file to the main working tree&#8217;s
46304632
<code>config.worktree</code> file, if present:</p>
46314633
</div>
4634+
<div class="openblock">
4635+
<div class="content">
46324636
<div class="ulist">
46334637
<ul>
46344638
<li>
@@ -4641,6 +4645,8 @@ <h3 id="_variables">Variables</h3>
46414645
</li>
46424646
</ul>
46434647
</div>
4648+
</div>
4649+
</div>
46444650
<div class="paragraph">
46454651
<p>It may also be beneficial to adjust the locations of <code>core.sparseCheckout</code>
46464652
and <code>core.sparseCheckoutCone</code> depending on your desire for customizable
@@ -4652,15 +4658,12 @@ <h3 id="_variables">Variables</h3>
46524658
details.</p>
46534659
</div>
46544660
<div class="paragraph">
4655-
<p>+
4656-
For historical reasons, this extension is respected regardless of the
4661+
<p>For historical reasons, this extension is respected regardless of the
46574662
<code>core.repositoryFormatVersion</code> setting.</p>
46584663
</div>
46594664
</dd>
46604665
</dl>
46614666
</div>
4662-
</div>
4663-
</div>
46644667
</dd>
46654668
<dt class="hdlist1">fastimport.unpackLimit</dt>
46664669
<dd>

git-diff-tree.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,13 +2163,16 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
21632163
</li>
21642164
</ul>
21652165
</div>
2166+
<div class="openblock">
2167+
<div class="content">
21662168
<div class="paragraph">
21672169
<p>For example, to produce decorations with no wrapping
21682170
or tag annotations, and spaces as separators:</p>
21692171
</div>
21702172
<div class="paragraph">
2171-
<p>+
2172-
<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
2173+
<p><code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
2174+
</div>
2175+
</div>
21732176
</div>
21742177
<div class="dlist">
21752178
<dl>

git-fsck.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,10 @@ <h2 id="_fsck_messages">FSCK MESSAGES</h2>
803803
<dd>
804804
<p>(ERROR) The referent name of a symref is invalid.</p>
805805
</dd>
806+
<dt class="hdlist1"><code>badReftableTableName</code></dt>
807+
<dd>
808+
<p>(WARN) A reftable table has an invalid name.</p>
809+
</dd>
806810
<dt class="hdlist1"><code>badTagName</code></dt>
807811
<dd>
808812
<p>(INFO) A tag has an invalid format.</p>
@@ -890,14 +894,6 @@ <h2 id="_fsck_messages">FSCK MESSAGES</h2>
890894
<dd>
891895
<p>(INFO) Could not parse .<code>gitmodules</code> blob.</p>
892896
</dd>
893-
</dl>
894-
</div>
895-
<div class="paragraph">
896-
<p><code>gitmodulesLarge</code>;
897-
(ERROR) .<code>gitmodules</code> blob is too large to parse.</p>
898-
</div>
899-
<div class="dlist">
900-
<dl>
901897
<dt class="hdlist1"><code>gitmodulesPath</code></dt>
902898
<dd>
903899
<p>(ERROR) .<code>gitmodules</code> path is invalid.</p>

git-log.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,13 +2493,16 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
24932493
</li>
24942494
</ul>
24952495
</div>
2496+
<div class="openblock">
2497+
<div class="content">
24962498
<div class="paragraph">
24972499
<p>For example, to produce decorations with no wrapping
24982500
or tag annotations, and spaces as separators:</p>
24992501
</div>
25002502
<div class="paragraph">
2501-
<p>+
2502-
<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
2503+
<p><code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
2504+
</div>
2505+
</div>
25032506
</div>
25042507
<div class="dlist">
25052508
<dl>

git-rev-list.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2629,13 +2629,16 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
26292629
</li>
26302630
</ul>
26312631
</div>
2632+
<div class="openblock">
2633+
<div class="content">
26322634
<div class="paragraph">
26332635
<p>For example, to produce decorations with no wrapping
26342636
or tag annotations, and spaces as separators:</p>
26352637
</div>
26362638
<div class="paragraph">
2637-
<p>+
2638-
<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
2639+
<p><code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
2640+
</div>
2641+
</div>
26392642
</div>
26402643
<div class="dlist">
26412644
<dl>

git-show.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,13 +1123,16 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
11231123
</li>
11241124
</ul>
11251125
</div>
1126+
<div class="openblock">
1127+
<div class="content">
11261128
<div class="paragraph">
11271129
<p>For example, to produce decorations with no wrapping
11281130
or tag annotations, and spaces as separators:</p>
11291131
</div>
11301132
<div class="paragraph">
1131-
<p>+
1132-
<code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
1133+
<p><code>%</code>(<code>decorate:prefix=,suffix=,tag=,separator=</code> )</p>
1134+
</div>
1135+
</div>
11331136
</div>
11341137
<div class="dlist">
11351138
<dl>

pretty-formats.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ ref names with custom decorations. The `decorate` string may be followed by a
232232
colon and zero or more comma-separated options. Option values may contain
233233
literal formatting codes. These must be used for commas (`%x2C`) and closing
234234
parentheses (`%x29`), due to their role in the option syntax.
235-
+
235+
236236
** `prefix=<value>`: Shown before the list of ref names. Defaults to "{nbsp}++(++".
237237
** `suffix=<value>`: Shown after the list of ref names. Defaults to "+)+".
238238
** `separator=<value>`: Shown between ref names. Defaults to "+,+{nbsp}".
@@ -241,10 +241,12 @@ parentheses (`%x29`), due to their role in the option syntax.
241241
** `tag=<value>`: Shown before tag names. Defaults to "`tag:`{nbsp}".
242242
243243
+
244+
--
244245
For example, to produce decorations with no wrapping
245246
or tag annotations, and spaces as separators:
246-
+
247+
247248
++%(decorate:prefix=,suffix=,tag=,separator= )++
249+
--
248250
249251
++%(describe++`[:<option>,...]`++)++::
250252
human-readable name, like linkgit:git-describe[1]; empty string for

0 commit comments

Comments
 (0)