freshlybakedca.ke
Git fork
Merge branch 'tz/doc-txt-to-adoc-fixes'
Fallouts from recent renaming of documentation files from .txt
suffix to the new .adoc suffix have been corrected.
* tz/doc-txt-to-adoc-fixes: (38 commits)
xdiff: *.txt -> *.adoc fixes
unpack-trees.c: *.txt -> *.adoc fixes
transport.h: *.txt -> *.adoc fixes
trace2/tr2_sysenv.c: *.txt -> *.adoc fixes
trace2.h: *.txt -> *.adoc fixes
t6434: *.txt -> *.adoc fixes
t6012: *.txt -> *.adoc fixes
t/helper/test-rot13-filter.c: *.txt -> *.adoc fixes
simple-ipc.h: *.txt -> *.adoc fixes
setup.c: *.txt -> *.adoc fixes
refs.h: *.txt -> *.adoc fixes
pseudo-merge.h: *.txt -> *.adoc fixes
parse-options.h: *.txt -> *.adoc fixes
object-name.c: *.txt -> *.adoc fixes
list-objects-filter-options.h: *.txt -> *.adoc fixes
fsck.h: *.txt -> *.adoc fixes
diffcore.h: *.txt -> *.adoc fixes
diff.h: *.txt -> *.adoc fixes
contrib/long-running-filter: *.txt -> *.adoc fixes
config.c: *.txt -> *.adoc fixes
...
+3
-3
.gitattributes
+3
-3
.gitattributes
···
12
12
/GIT-VERSION-GEN text eol=lf
13
13
/mergetools/* text eol=lf
14
14
/t/oid-info/* text eol=lf
15
-
/Documentation/git-merge.txt conflict-marker-size=32
16
-
/Documentation/gitk.txt conflict-marker-size=32
17
-
/Documentation/user-manual.txt conflict-marker-size=32
15
+
/Documentation/git-merge.adoc conflict-marker-size=32
16
+
/Documentation/gitk.adoc conflict-marker-size=32
17
+
/Documentation/user-manual.adoc conflict-marker-size=32
18
18
/t/t????-*.sh conflict-marker-size=32
-1
Documentation/.gitattributes
-1
Documentation/.gitattributes
···
1
-
*.txt whitespace
+2
-2
Documentation/CodingGuidelines
+2
-2
Documentation/CodingGuidelines
···
44
44
uses (even if it doesn't match the overall style of existing code).
45
45
46
46
But if you must have a list of rules, here are some language
47
-
specific ones. Note that Documentation/ToolsForGit.txt document
47
+
specific ones. Note that Documentation/ToolsForGit.adoc document
48
48
has a collection of tips to help you use some external tools
49
49
to conform to these guidelines.
50
50
···
755
755
Writing Documentation:
756
756
757
757
Most (if not all) of the documentation pages are written in the
758
-
AsciiDoc format in *.txt files (e.g. Documentation/git.txt), and
758
+
AsciiDoc format in *.adoc files (e.g. Documentation/git.adoc), and
759
759
processed into HTML and manpages (e.g. git.html and git.1 in the
760
760
same directory).
761
761
+12
-12
Documentation/MyFirstContribution.adoc
+12
-12
Documentation/MyFirstContribution.adoc
···
21
21
useful additional context:
22
22
23
23
- `Documentation/SubmittingPatches`
24
-
- `Documentation/howto/new-command.txt`
24
+
- `Documentation/howto/new-command.adoc`
25
25
26
26
[[getting-help]]
27
27
=== Getting Help
···
331
331
apply standard precedence rules. `git_config_get_string_tmp()` will look up
332
332
a specific key ("user.name") and give you the value. There are a number of
333
333
single-key lookup functions like this one; you can see them all (and more info
334
-
about how to use `git_config()`) in `Documentation/technical/api-config.txt`.
334
+
about how to use `git_config()`) in `Documentation/technical/api-config.adoc`.
335
335
336
336
You should see that the name printed matches the one you see when you run:
337
337
···
461
461
462
462
Your new command is undocumented! Let's fix that.
463
463
464
-
Take a look at `Documentation/git-*.txt`. These are the manpages for the
464
+
Take a look at `Documentation/git-*.adoc`. These are the manpages for the
465
465
subcommands that Git knows about. You can open these up and take a look to get
466
466
acquainted with the format, but then go ahead and make a new file
467
-
`Documentation/git-psuh.txt`. Like with most of the documentation in the Git
467
+
`Documentation/git-psuh.adoc`. Like with most of the documentation in the Git
468
468
project, help pages are written with AsciiDoc (see CodingGuidelines, "Writing
469
469
Documentation" section). Use the following template to fill out your own
470
470
manpage:
···
543
543
That's because `-h` is a special case which your command should handle by
544
544
printing usage.
545
545
546
-
Take a look at `Documentation/technical/api-parse-options.txt`. This is a handy
546
+
Take a look at `Documentation/technical/api-parse-options.adoc`. This is a handy
547
547
tool for pulling out options you need to be able to handle, and it takes a
548
548
usage string.
549
549
···
1088
1088
The one generated for `psuh` from the sample implementation looks like this:
1089
1089
1090
1090
----
1091
-
Documentation/git-psuh.txt | 40 +++++++++++++++++++++
1092
-
Makefile | 1 +
1093
-
builtin.h | 1 +
1094
-
builtin/psuh.c | 73 ++++++++++++++++++++++++++++++++++++++
1095
-
git.c | 1 +
1096
-
t/t9999-psuh-tutorial.sh | 12 +++++++
1091
+
Documentation/git-psuh.adoc | 40 +++++++++++++++++++++
1092
+
Makefile | 1 +
1093
+
builtin.h | 1 +
1094
+
builtin/psuh.c | 73 ++++++++++++++++++++++++++++++++++++++
1095
+
git.c | 1 +
1096
+
t/t9999-psuh-tutorial.sh | 12 +++++++
1097
1097
6 files changed, 128 insertions(+)
1098
-
create mode 100644 Documentation/git-psuh.txt
1098
+
create mode 100644 Documentation/git-psuh.adoc
1099
1099
create mode 100644 builtin/psuh.c
1100
1100
create mode 100755 t/t9999-psuh-tutorial.sh
1101
1101
----
+6
-6
Documentation/MyFirstObjectWalk.adoc
+6
-6
Documentation/MyFirstObjectWalk.adoc
···
15
15
16
16
=== Related Reading
17
17
18
-
- `Documentation/user-manual.txt` under "Hacking Git" contains some coverage of
18
+
- `Documentation/user-manual.adoc` under "Hacking Git" contains some coverage of
19
19
the revision walker in its various incarnations.
20
20
- `revision.h`
21
21
- https://eagain.net/articles/git-for-computer-scientists/[Git for Computer Scientists]
···
112
112
----
113
113
114
114
NOTE: For a more exhaustive overview of the new command process, take a look at
115
-
`Documentation/MyFirstContribution.txt`.
115
+
`Documentation/MyFirstContribution.adoc`.
116
116
117
117
NOTE: A reference implementation can be found at
118
118
https://github.com/nasamuffin/git/tree/revwalk.
···
132
132
Per entry, we find:
133
133
134
134
`item` is the object provided upon which to base the object walk. Items in Git
135
-
can be blobs, trees, commits, or tags. (See `Documentation/gittutorial-2.txt`.)
135
+
can be blobs, trees, commits, or tags. (See `Documentation/gittutorial-2.adoc`.)
136
136
137
137
`name` is the object ID (OID) of the object - a hex string you may be familiar
138
138
with from using Git to organize your source in the past. Check the tutorial
···
141
141
142
142
`whence` indicates some information about what to do with the parents of the
143
143
specified object. We'll explore this flag more later on; take a look at
144
-
`Documentation/revisions.txt` to get an idea of what could set the `whence`
144
+
`Documentation/revisions.adoc` to get an idea of what could set the `whence`
145
145
value.
146
146
147
147
`flags` are used to hint the beginning of the revision walk and are the first
···
153
153
154
154
This one is quite a bit longer, and many fields are only used during the walk
155
155
by `revision.c` - not configuration options. Most of the configurable flags in
156
-
`struct rev_info` have a mirror in `Documentation/rev-list-options.txt`. It's a
156
+
`struct rev_info` have a mirror in `Documentation/rev-list-options.adoc`. It's a
157
157
good idea to take some time and read through that document.
158
158
159
159
== Basic Commit Walk
···
710
710
=== Adding a Filter
711
711
712
712
There are a handful of filters that we can apply to the object walk laid out in
713
-
`Documentation/rev-list-options.txt`. These filters are typically useful for
713
+
`Documentation/rev-list-options.adoc`. These filters are typically useful for
714
714
operations such as creating packfiles or performing a partial clone. They are
715
715
defined in `list-objects-filter-options.h`. For the purposes of this tutorial we
716
716
will use the "tree:1" filter, which causes the walk to omit all trees and blobs
+12
-12
Documentation/build-docdep.perl
+12
-12
Documentation/build-docdep.perl
···
4
4
my %include = ();
5
5
my %included = ();
6
6
7
-
for my $text (<*.txt>) {
8
-
open I, '<', $text || die "cannot read: $text";
7
+
for my $adoc (<*.adoc>) {
8
+
open I, '<', $adoc || die "cannot read: $adoc";
9
9
while (<I>) {
10
10
if (/^include::/) {
11
11
chomp;
12
12
s/^include::\s*//;
13
13
s/\[\]//;
14
14
s/{build_dir}/${build_dir}/;
15
-
$include{$text}{$_} = 1;
15
+
$include{$adoc}{$_} = 1;
16
16
$included{$_} = 1;
17
17
}
18
18
}
···
23
23
my $changed = 1;
24
24
while ($changed) {
25
25
$changed = 0;
26
-
while (my ($text, $included) = each %include) {
26
+
while (my ($adoc, $included) = each %include) {
27
27
for my $i (keys %$included) {
28
-
# $text has include::$i; if $i includes $j
29
-
# $text indirectly includes $j.
28
+
# $adoc has include::$i; if $i includes $j
29
+
# $adoc indirectly includes $j.
30
30
if (exists $include{$i}) {
31
31
for my $j (keys %{$include{$i}}) {
32
-
if (!exists $include{$text}{$j}) {
33
-
$include{$text}{$j} = 1;
32
+
if (!exists $include{$adoc}{$j}) {
33
+
$include{$adoc}{$j} = 1;
34
34
$included{$j} = 1;
35
35
$changed = 1;
36
36
}
···
40
40
}
41
41
}
42
42
43
-
foreach my $text (sort keys %include) {
44
-
my $included = $include{$text};
45
-
if (! exists $included{$text} &&
46
-
(my $base = $text) =~ s/\.txt$//) {
43
+
foreach my $adoc (sort keys %include) {
44
+
my $included = $include{$adoc};
45
+
if (! exists $included{$adoc} &&
46
+
(my $base = $adoc) =~ s/\.adoc$//) {
47
47
print "$base.html $base.xml : ", join(" ", sort keys %$included), "\n";
48
48
}
49
49
}
+3
-3
Documentation/gitattributes.adoc
+3
-3
Documentation/gitattributes.adoc
···
513
513
`filter.<driver>.process` then Git can process all blobs with a
514
514
single filter invocation for the entire life of a single Git
515
515
command. This is achieved by using the long-running process protocol
516
-
(described in technical/long-running-process-protocol.txt).
516
+
(described in Documentation/technical/long-running-process-protocol.adoc).
517
517
518
518
When Git encounters the first file that needs to be cleaned or smudged,
519
519
it starts the filter and performs the handshake. In the handshake, the
···
1177
1177
1178
1178
For example, this line in `.gitattributes` can be used to tell the merge
1179
1179
machinery to leave much longer (instead of the usual 7-character-long)
1180
-
conflict markers when merging the file `Documentation/git-merge.txt`
1180
+
conflict markers when merging the file `Documentation/git-merge.adoc`
1181
1181
results in a conflict.
1182
1182
1183
1183
------------------------
1184
-
Documentation/git-merge.txt conflict-marker-size=32
1184
+
Documentation/git-merge.adoc conflict-marker-size=32
1185
1185
------------------------
1186
1186
1187
1187
+7
-7
Documentation/howto/howto-index.sh
+7
-7
Documentation/howto/howto-index.sh
···
9
9
10
10
EOF
11
11
12
-
for txt
12
+
for adoc
13
13
do
14
-
title=$(expr "$txt" : '.*/\(.*\)\.txt$')
14
+
title=$(expr "$adoc" : '.*/\(.*\)\.adoc$')
15
15
from=$(sed -ne '
16
16
/^$/q
17
17
/^From:[ ]/{
···
21
21
s/^/by /
22
22
p
23
23
}
24
-
' "$txt")
24
+
' "$adoc")
25
25
26
26
abstract=$(sed -ne '
27
27
/^Abstract:[ ]/{
···
39
39
x
40
40
p
41
41
q
42
-
}' "$txt")
42
+
}' "$adoc")
43
43
44
-
if grep 'Content-type: text/asciidoc' >/dev/null $txt
44
+
if grep 'Content-type: text/asciidoc' >/dev/null $adoc
45
45
then
46
-
file=$(expr "$txt" : '\(.*\)\.txt$').html
46
+
file=$(expr "$adoc" : '\(.*\)\.adoc$').html
47
47
else
48
-
file="$txt"
48
+
file="$adoc"
49
49
fi
50
50
51
51
echo "* link:howto/$(basename "$file")[$title] $from
+1
-1
Documentation/howto/new-command.adoc
+1
-1
Documentation/howto/new-command.adoc
···
48
48
to find things.
49
49
50
50
See the CodingGuidelines document for other guidance on what we consider
51
-
good practice in C and shell, and api-builtin.txt for the support
51
+
good practice in C and shell, and builtin.h for the support
52
52
functions available to built-in commands written in C.
53
53
54
54
What every extension command needs
+1
-1
Documentation/technical/api-simple-ipc.adoc
+1
-1
Documentation/technical/api-simple-ipc.adoc
···
36
36
---------------------------------
37
37
38
38
The Simple-IPC mechanism differs from the existing `sub-process.c`
39
-
model (Documentation/technical/long-running-process-protocol.txt) and
39
+
model (Documentation/technical/long-running-process-protocol.adoc) and
40
40
used by applications like Git-LFS. In the LFS-style sub-process model,
41
41
the helper is started by the foreground process, communication happens
42
42
via a pair of file descriptors bound to the stdin/stdout of the
+1
-1
Documentation/technical/hash-function-transition.adoc
+1
-1
Documentation/technical/hash-function-transition.adoc
···
394
394
395
395
Step 4 is probably necessary for good read-time performance. "git
396
396
pack-objects" on the server optimizes the pack file for good data
397
-
locality (see Documentation/technical/pack-heuristics.txt).
397
+
locality (see Documentation/technical/pack-heuristics.adoc).
398
398
399
399
Details of this process are likely to change. It will take some
400
400
experimenting to get this to perform well.
+1
-1
Documentation/technical/partial-clone.adoc
+1
-1
Documentation/technical/partial-clone.adoc
···
85
85
server to request filtering during packfile construction.
86
86
+
87
87
There are various filters available to accommodate different situations.
88
-
See "--filter=<filter-spec>" in Documentation/rev-list-options.txt.
88
+
See "--filter=<filter-spec>" in Documentation/rev-list-options.adoc.
89
89
90
90
- On the server pack-objects applies the requested filter-spec as it
91
91
creates "filtered" packfiles for the client.
+1
-1
Makefile
+1
-1
Makefile
···
194
194
# Linux, kernel 2.6.11 or newer is required for reliable sub-second file times
195
195
# on file systems with exactly 1 ns or 1 s resolution. If you intend to use Git
196
196
# on other file systems (e.g. CEPH, CIFS, NTFS, UDF), don't enable USE_NSEC. See
197
-
# Documentation/technical/racy-git.txt for details.
197
+
# Documentation/technical/racy-git.adoc for details.
198
198
#
199
199
# Define USE_ST_TIMESPEC if your "struct stat" uses "st_ctimespec" instead of
200
200
# "st_ctim"
+7
-7
README.md
+7
-7
README.md
···
17
17
Many Git online resources are accessible from <https://git-scm.com/>
18
18
including full documentation and Git related tools.
19
19
20
-
See [Documentation/gittutorial.txt][] to get started, then see
21
-
[Documentation/giteveryday.txt][] for a useful minimum set of commands, and
22
-
`Documentation/git-<commandname>.txt` for documentation of each command.
20
+
See [Documentation/gittutorial.adoc][] to get started, then see
21
+
[Documentation/giteveryday.adoc][] for a useful minimum set of commands, and
22
+
`Documentation/git-<commandname>.adoc` for documentation of each command.
23
23
If git has been correctly installed, then the tutorial can also be
24
24
read with `man gittutorial` or `git help tutorial`, and the
25
25
documentation of each command with `man git-<commandname>` or `git help
26
26
<commandname>`.
27
27
28
-
CVS users may also want to read [Documentation/gitcvs-migration.txt][]
28
+
CVS users may also want to read [Documentation/gitcvs-migration.adoc][]
29
29
(`man gitcvs-migration` or `git help cvs-migration` if git is
30
30
installed).
31
31
···
66
66
- "goddamn idiotic truckload of sh*t": when it breaks
67
67
68
68
[INSTALL]: INSTALL
69
-
[Documentation/gittutorial.txt]: Documentation/gittutorial.txt
70
-
[Documentation/giteveryday.txt]: Documentation/giteveryday.txt
71
-
[Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
69
+
[Documentation/gittutorial.adoc]: Documentation/gittutorial.adoc
70
+
[Documentation/giteveryday.adoc]: Documentation/giteveryday.adoc
71
+
[Documentation/gitcvs-migration.adoc]: Documentation/gitcvs-migration.adoc
72
72
[Documentation/SubmittingPatches]: Documentation/SubmittingPatches
73
73
[Documentation/CodingGuidelines]: Documentation/CodingGuidelines
74
74
[po/README.md]: po/README.md
+1
-1
advice.h
+1
-1
advice.h
···
7
7
* To add a new advice, you need to:
8
8
* Define a new advice_type.
9
9
* Add a new entry to advice_setting array.
10
-
* Add the new config variable to Documentation/config/advice.txt.
10
+
* Add the new config variable to Documentation/config/advice.adoc.
11
11
* Call advise_if_enabled to print your advice.
12
12
*/
13
13
enum advice_type {
+1
-1
apply.c
+1
-1
apply.c
···
82
82
}
83
83
/*
84
84
* Please update $__git_whitespacelist in git-completion.bash,
85
-
* Documentation/git-apply.txt, and Documentation/git-am.txt
85
+
* Documentation/git-apply.adoc, and Documentation/git-am.adoc
86
86
* when you add new options.
87
87
*/
88
88
return error(_("unrecognized whitespace option '%s'"), option);
+1
-1
builtin.h
+1
-1
builtin.h
+8
-8
config.c
+8
-8
config.c
···
1647
1647
return 0;
1648
1648
}
1649
1649
1650
-
/* Add other config variables here and to Documentation/config.txt. */
1650
+
/* Add other config variables here and to Documentation/config.adoc. */
1651
1651
return platform_core_config(var, value, ctx, cb);
1652
1652
}
1653
1653
···
1658
1658
return 0;
1659
1659
}
1660
1660
1661
-
/* Add other config variables here and to Documentation/config/sparse.txt. */
1661
+
/* Add other config variables here and to Documentation/config/sparse.adoc. */
1662
1662
return 0;
1663
1663
}
1664
1664
···
1674
1674
return git_config_string(&git_log_output_encoding, var, value);
1675
1675
}
1676
1676
1677
-
/* Add other config variables here and to Documentation/config.txt. */
1677
+
/* Add other config variables here and to Documentation/config.adoc. */
1678
1678
return 0;
1679
1679
}
1680
1680
···
1710
1710
return 0;
1711
1711
}
1712
1712
1713
-
/* Add other config variables here and to Documentation/config.txt. */
1713
+
/* Add other config variables here and to Documentation/config.adoc. */
1714
1714
return 0;
1715
1715
}
1716
1716
···
1739
1739
return 0;
1740
1740
}
1741
1741
1742
-
/* Add other config variables here and to Documentation/config.txt. */
1742
+
/* Add other config variables here and to Documentation/config.adoc. */
1743
1743
return 0;
1744
1744
}
1745
1745
···
1755
1755
return git_config_string(&git_mailmap_blob, var, value);
1756
1756
}
1757
1757
1758
-
/* Add other config variables here and to Documentation/config.txt. */
1758
+
/* Add other config variables here and to Documentation/config.adoc. */
1759
1759
return 0;
1760
1760
}
1761
1761
···
1768
1768
1769
1769
/*
1770
1770
* Add other attribute related config variables here and to
1771
-
* Documentation/config/attr.txt.
1771
+
* Documentation/config/attr.adoc.
1772
1772
*/
1773
1773
return 0;
1774
1774
}
···
1826
1826
if (starts_with(var, "sparse."))
1827
1827
return git_default_sparse_config(var, value);
1828
1828
1829
-
/* Add other config variables here and to Documentation/config.txt. */
1829
+
/* Add other config variables here and to Documentation/config.adoc. */
1830
1830
return 0;
1831
1831
}
1832
1832
+1
-1
contrib/contacts/Makefile
+1
-1
contrib/contacts/Makefile
contrib/contacts/git-contacts.txt
contrib/contacts/git-contacts.adoc
contrib/contacts/git-contacts.txt
contrib/contacts/git-contacts.adoc
+2
-2
contrib/contacts/meson.build
+2
-2
contrib/contacts/meson.build
···
16
16
'@INPUT@',
17
17
],
18
18
depends: documentation_deps,
19
-
input: 'git-contacts.txt',
19
+
input: 'git-contacts.adoc',
20
20
output: 'git-contacts.xml',
21
21
)
22
22
···
47
47
'@INPUT@',
48
48
],
49
49
depends: documentation_deps,
50
-
input: 'git-contacts.txt',
50
+
input: 'git-contacts.adoc',
51
51
output: 'git-contacts.html',
52
52
install: true,
53
53
install_dir: get_option('datadir') / 'doc/git-doc',
+1
-1
contrib/long-running-filter/example.pl
+1
-1
contrib/long-running-filter/example.pl
···
1
1
#!/usr/bin/perl
2
2
#
3
3
# Example implementation for the Git filter protocol version 2
4
-
# See Documentation/gitattributes.txt, section "Filter Protocol"
4
+
# See Documentation/gitattributes.adoc, section "Filter Protocol"
5
5
#
6
6
# Please note, this pass-thru filter is a minimal skeleton. No proper
7
7
# error handling was implemented.
+1
-1
contrib/subtree/Makefile
+1
-1
contrib/subtree/Makefile
contrib/subtree/git-subtree.txt
contrib/subtree/git-subtree.adoc
contrib/subtree/git-subtree.txt
contrib/subtree/git-subtree.adoc
+2
-2
contrib/subtree/meson.build
+2
-2
contrib/subtree/meson.build
···
32
32
'@INPUT@',
33
33
],
34
34
depends: documentation_deps,
35
-
input: 'git-subtree.txt',
35
+
input: 'git-subtree.adoc',
36
36
output: 'git-subtree.xml',
37
37
)
38
38
···
63
63
'@INPUT@',
64
64
],
65
65
depends: documentation_deps,
66
-
input: 'git-subtree.txt',
66
+
input: 'git-subtree.adoc',
67
67
output: 'git-subtree.html',
68
68
install: true,
69
69
install_dir: get_option('datadir') / 'doc/git-doc',
+1
-1
diff.h
+1
-1
diff.h
+1
-1
diffcore.h
+1
-1
diffcore.h
···
107
107
struct diff_filespec *one;
108
108
struct diff_filespec *two;
109
109
unsigned short int score;
110
-
char status; /* M C R A D U etc. (see Documentation/diff-format.txt or DIFF_STATUS_* in diff.h) */
110
+
char status; /* M C R A D U etc. (see Documentation/diff-format.adoc or DIFF_STATUS_* in diff.h) */
111
111
unsigned broken_pair : 1;
112
112
unsigned renamed_pair : 1;
113
113
unsigned is_unmerged : 1;
+1
-1
fsck.h
+1
-1
fsck.h
+1
-1
list-objects-filter-options.h
+1
-1
list-objects-filter-options.h
···
82
82
* "filter" SP <arg>
83
83
*
84
84
* The filter keyword will be used by many commands.
85
-
* See Documentation/rev-list-options.txt for allowed values for <arg>.
85
+
* See Documentation/rev-list-options.adoc for allowed values for <arg>.
86
86
*
87
87
* Capture the given arg as the "filter_spec". This can be forwarded to
88
88
* subordinate commands when necessary (although it's better to pass it through
+1
-1
object-name.c
+1
-1
object-name.c
···
1273
1273
}
1274
1274
1275
1275
/*
1276
-
* Documentation/revisions.txt says:
1276
+
* Documentation/revisions.adoc says:
1277
1277
* '<describeOutput>', e.g. 'v1.7.4.2-679-g3bee7fb'::
1278
1278
* Output from `git describe`; i.e. a closest tag, optionally
1279
1279
* followed by a dash and a number of commits, followed by a dash, a
+1
-1
parse-options.h
+1
-1
parse-options.h
+1
-1
pseudo-merge.h
+1
-1
pseudo-merge.h
···
101
101
102
102
/*
103
103
* Represents a serialized view of a file containing pseudo-merge(s)
104
-
* (see Documentation/technical/bitmap-format.txt for a specification
104
+
* (see Documentation/technical/bitmap-format.adoc for a specification
105
105
* of the format).
106
106
*/
107
107
struct pseudo_merge_map {
+1
-1
refs.h
+1
-1
refs.h
···
577
577
578
578
/*
579
579
* Return 0 iff refname has the correct format for a refname according
580
-
* to the rules described in Documentation/git-check-ref-format.txt.
580
+
* to the rules described in Documentation/git-check-ref-format.adoc.
581
581
* If REFNAME_ALLOW_ONELEVEL is set in flags, then accept one-level
582
582
* reference names. If REFNAME_REFSPEC_PATTERN is set in flags, then
583
583
* allow a single "*" wildcard character in the refspec. No leading or
+1
-1
setup.c
+1
-1
setup.c
···
1822
1822
*
1823
1823
* Regardless of the state of nongit_ok, startup_info->prefix and
1824
1824
* the GIT_PREFIX environment variable must always match. For details
1825
-
* see Documentation/config/alias.txt.
1825
+
* see Documentation/config/alias.adoc.
1826
1826
*/
1827
1827
if (nongit_ok && *nongit_ok)
1828
1828
startup_info->have_repository = 0;
+1
-1
simple-ipc.h
+1
-1
simple-ipc.h
+1
-1
t/helper/test-rot13-filter.c
+1
-1
t/helper/test-rot13-filter.c
···
1
1
/*
2
2
* Example implementation for the Git filter protocol version 2
3
-
* See Documentation/gitattributes.txt, section "Filter Protocol"
3
+
* See Documentation/gitattributes.adoc, section "Filter Protocol"
4
4
*
5
5
* Usage: test-tool rot13-filter [--always-delay] --log=<path> <capabilities>
6
6
*
+25
-25
t/t0450-txt-doc-vs-help.sh
+25
-25
t/t0450-txt-doc-vs-help.sh
···
1
1
#!/bin/sh
2
2
3
-
test_description='assert (unbuilt) Documentation/*.txt and -h output
3
+
test_description='assert (unbuilt) Documentation/*.adoc and -h output
4
4
5
5
Run this with --debug to see a summary of where we still fail to make
6
6
the two versions consistent with one another.'
···
11
11
git --list-cmds=builtins >builtins
12
12
'
13
13
14
-
test_expect_success 'list of txt and help mismatches is sorted' '
15
-
sort -u "$TEST_DIRECTORY"/t0450/txt-help-mismatches >expect &&
16
-
if ! test_cmp expect "$TEST_DIRECTORY"/t0450/txt-help-mismatches
14
+
test_expect_success 'list of adoc and help mismatches is sorted' '
15
+
sort -u "$TEST_DIRECTORY"/t0450/adoc-help-mismatches >expect &&
16
+
if ! test_cmp expect "$TEST_DIRECTORY"/t0450/adoc-help-mismatches
17
17
then
18
-
BUG "please keep the list of txt and help mismatches sorted"
18
+
BUG "please keep the list of adoc and help mismatches sorted"
19
19
fi
20
20
'
21
21
···
40
40
echo "$out"
41
41
}
42
42
43
-
builtin_to_txt () {
44
-
echo "$GIT_BUILD_DIR/Documentation/git-$1.txt"
43
+
builtin_to_adoc () {
44
+
echo "$GIT_BUILD_DIR/Documentation/git-$1.adoc"
45
45
}
46
46
47
-
txt_to_synopsis () {
47
+
adoc_to_synopsis () {
48
48
builtin="$1" &&
49
49
out_dir="out/$builtin" &&
50
-
out="$out_dir/txt.synopsis" &&
50
+
out="$out_dir/adoc.synopsis" &&
51
51
if test -f "$out"
52
52
then
53
53
echo "$out" &&
54
54
return 0
55
55
fi &&
56
-
b2t="$(builtin_to_txt "$builtin")" &&
56
+
b2t="$(builtin_to_adoc "$builtin")" &&
57
57
sed -n \
58
58
-E '/^\[(verse|synopsis)\]$/,/^$/ {
59
59
/^$/d;
···
109
109
fi
110
110
'
111
111
112
-
txt="$(builtin_to_txt "$builtin")" &&
113
-
preq="$(echo BUILTIN_TXT_$builtin | tr '[:lower:]-' '[:upper:]_')" &&
112
+
adoc="$(builtin_to_adoc "$builtin")" &&
113
+
preq="$(echo BUILTIN_ADOC_$builtin | tr '[:lower:]-' '[:upper:]_')" &&
114
114
115
-
if test -f "$txt"
115
+
if test -f "$adoc"
116
116
then
117
117
test_set_prereq "$preq"
118
118
fi &&
119
119
120
-
# *.txt output assertions
121
-
test_expect_success "$preq" "$builtin *.txt SYNOPSIS has dashed labels" '
122
-
check_dashed_labels "$(txt_to_synopsis "$builtin")"
120
+
# *.adoc output assertions
121
+
test_expect_success "$preq" "$builtin *.adoc SYNOPSIS has dashed labels" '
122
+
check_dashed_labels "$(adoc_to_synopsis "$builtin")"
123
123
'
124
124
125
-
# *.txt output consistency assertions
125
+
# *.adoc output consistency assertions
126
126
result=
127
-
if grep -q "^$builtin$" "$TEST_DIRECTORY"/t0450/txt-help-mismatches
127
+
if grep -q "^$builtin$" "$TEST_DIRECTORY"/t0450/adoc-help-mismatches
128
128
then
129
129
result=failure
130
130
else
131
131
result=success
132
132
fi &&
133
133
test_expect_$result "$preq" "$builtin -h output and SYNOPSIS agree" '
134
-
t2s="$(txt_to_synopsis "$builtin")" &&
134
+
t2s="$(adoc_to_synopsis "$builtin")" &&
135
135
if test "$builtin" = "merge-tree"
136
136
then
137
137
test_when_finished "rm -f t2s.new" &&
···
140
140
fi &&
141
141
h2s="$(help_to_synopsis "$builtin")" &&
142
142
143
-
# The *.txt and -h use different spacing for the
143
+
# The *.adoc and -h use different spacing for the
144
144
# alignment of continued usage output, normalize it.
145
-
align_after_nl "$builtin" <"$t2s" >txt &&
145
+
align_after_nl "$builtin" <"$t2s" >adoc &&
146
146
align_after_nl "$builtin" <"$h2s" >help &&
147
-
test_cmp txt help
147
+
test_cmp adoc help
148
148
'
149
149
150
-
if test_have_prereq "$preq" && test -e txt && test -e help
150
+
if test_have_prereq "$preq" && test -e adoc && test -e help
151
151
then
152
152
test_debug '
153
-
if test_cmp txt help >cmp 2>/dev/null
153
+
if test_cmp adoc help >cmp 2>/dev/null
154
154
then
155
155
echo "=== DONE: $builtin ==="
156
156
else
···
161
161
162
162
# Not in test_expect_success in case --run is being
163
163
# used with --debug
164
-
rm -f txt help tmp 2>/dev/null
164
+
rm -f adoc help tmp 2>/dev/null
165
165
fi
166
166
done <builtins
167
167
t/t0450/txt-help-mismatches
t/t0450/adoc-help-mismatches
t/t0450/txt-help-mismatches
t/t0450/adoc-help-mismatches
+1
-1
t/t6012-rev-list-simplify.sh
+1
-1
t/t6012-rev-list-simplify.sh
+1
-1
t/t6434-merge-recursive-rename-options.sh
+1
-1
t/t6434-merge-recursive-rename-options.sh
···
22
22
R100 3-old 3-new
23
23
24
24
Actual similarity indices are parsed from diff output. We rely on the fact that
25
-
they are rounded down (see, e.g., Documentation/diff-generate-patch.txt, which
25
+
they are rounded down (see, e.g., Documentation/diff-generate-patch.adoc, which
26
26
mentions this in a different context).
27
27
'
28
28
+1
-1
trace2.h
+1
-1
trace2.h
+1
-1
trace2/tr2_sysenv.c
+1
-1
trace2/tr2_sysenv.c
+1
-1
transport.h
+1
-1
transport.h
···
168
168
* Check whether a transport is allowed by the environment.
169
169
*
170
170
* Type should generally be the URL scheme, as described in
171
-
* Documentation/git.txt
171
+
* Documentation/git.adoc
172
172
*
173
173
* from_user specifies if the transport was given by the user. If unknown pass
174
174
* a -1 to read from the environment to determine if the transport was given by
+1
-1
unpack-trees.c
+1
-1
unpack-trees.c
···
2904
2904
* The rule is to "carry forward" what is in the index without losing
2905
2905
* information across a "fast-forward", favoring a successful merge
2906
2906
* over a merge failure when it makes sense. For details of the
2907
-
* "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2907
+
* "carry forward" rule, please see <Documentation/git-read-tree.adoc>.
2908
2908
*
2909
2909
*/
2910
2910
int twoway_merge(const struct cache_entry * const *src,
+1
-1
xdiff/xdiff.h
+1
-1
xdiff/xdiff.h