use 'commit-ish' instead of 'committish'
Replace 'committish' in documentation and comments with 'commit-ish' to match gitglossary(7) and to be consistent with 'tree-ish'. The only remaining instances of 'committish' are: * variable, function, and macro names * "(also committish)" in the definition of commit-ish in gitglossary[7] Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Hansen committed
Sep 4, 2013 at 15:04 UTC
a8a5406ab32fccabf8ed08001d50b5373e18ff1a
23 files changed
+63
-63
Documentation/config.txt
+2
-2
@@ -170,8 +170,8 @@ advice.*::
170
pushNeedsForce::
171
Shown when linkgit:git-push[1] rejects an update that
172
tries to overwrite a remote ref that points at an
173
- object that is not a committish, or make the remote
174
- ref point at an object that is not a committish.
173
+ object that is not a commit-ish, or make the remote
174
+ ref point at an object that is not a commit-ish.
175
statusHints::
176
Show directions on how to proceed from the current
177
state in the output of linkgit:git-status[1], in
Documentation/git-describe.txt
+7
-7
@@ -9,7 +9,7 @@ git-describe - Show the most recent tag that is reachable from a commit
9
SYNOPSIS
10
--------
11
[verse]
12
-'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <committish>...
12
+'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <commit-ish>...
13
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]
14
15
DESCRIPTION
@@ -26,8 +26,8 @@ see the -a and -s options to linkgit:git-tag[1].
26
27
OPTIONS
28
-------
29
-<committish>...::
30
- Committish object names to describe.
29
+<commit-ish>...::
30
+ Commit-ish object names to describe.
31
32
--dirty[=<mark>]::
33
Describe the working tree.
@@ -57,7 +57,7 @@ OPTIONS
57
58
--candidates=<n>::
59
Instead of considering only the 10 most recent tags as
60
- candidates to describe the input committish consider
60
+ candidates to describe the input commit-ish consider
61
up to <n> candidates. Increasing <n> above 10 will take
62
slightly longer but may produce a more accurate result.
63
An <n> of 0 will cause only exact matches to be output.
@@ -145,7 +145,7 @@ be sufficient to disambiguate these commits.
145
SEARCH STRATEGY
146
---------------
147
148
-For each committish supplied, 'git describe' will first look for
148
+For each commit-ish supplied, 'git describe' will first look for
149
a tag which tags exactly that commit. Annotated tags will always
150
be preferred over lightweight tags, and tags with newer dates will
151
always be preferred over tags with older dates. If an exact match
@@ -154,12 +154,12 @@ is found, its name will be output and searching will stop.
154
If an exact match was not found, 'git describe' will walk back
155
through the commit history to locate an ancestor commit which
156
has been tagged. The ancestor's tag will be output along with an
157
-abbreviation of the input committish's SHA-1. If '--first-parent' was
157
+abbreviation of the input commit-ish's SHA-1. If '--first-parent' was
158
specified then the walk will only consider the first parent of each
159
commit.
160
161
If multiple tags were found during the walk then the tag which
162
-has the fewest commits different from the input committish will be
162
+has the fewest commits different from the input commit-ish will be
163
selected and output. Here fewest commits different is defined as
164
the number of commits which would be shown by `git log tag..input`
165
will be the smallest number of commits possible.
Documentation/git-fast-import.txt
+13
-13
@@ -380,8 +380,8 @@ change to the project.
380
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
381
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
382
data
383
- ('from' SP <committish> LF)?
384
- ('merge' SP <committish> LF)?
383
+ ('from' SP <commit-ish> LF)?
384
+ ('merge' SP <commit-ish> LF)?
385
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
386
LF?
387
....
@@ -460,9 +460,9 @@ as the current commit on that branch is automatically assumed to
460
be the first ancestor of the new commit.
461
462
As `LF` is not valid in a Git refname or SHA-1 expression, no
463
-quoting or escaping syntax is supported within `<committish>`.
463
+quoting or escaping syntax is supported within `<commit-ish>`.
464
465
-Here `<committish>` is any of the following:
465
+Here `<commit-ish>` is any of the following:
466
467
* The name of an existing branch already in fast-import's internal branch
468
table. If fast-import doesn't know the name, it's treated as a SHA-1
@@ -509,7 +509,7 @@ additional ancestors (forming a 16-way merge). For this reason
509
it is suggested that frontends do not use more than 15 `merge`
510
commands per commit; 16, if starting a new, empty branch.
511
512
-Here `<committish>` is any of the commit specification expressions
512
+Here `<commit-ish>` is any of the commit specification expressions
513
also accepted by `from` (see above).
514
515
`filemodify`
@@ -677,8 +677,8 @@ paths for a commit are encouraged to do so.
677
`notemodify`
678
^^^^^^^^^^^^
679
Included in a `commit` `<notes_ref>` command to add a new note
680
-annotating a `<committish>` or change this annotation contents.
681
-Internally it is similar to filemodify 100644 on `<committish>`
680
+annotating a `<commit-ish>` or change this annotation contents.
681
+Internally it is similar to filemodify 100644 on `<commit-ish>`
682
path (maybe split into subdirectories). It's not advised to
683
use any other commands to write to the `<notes_ref>` tree except
684
`filedeleteall` to delete all existing notes in this tree.
@@ -691,7 +691,7 @@ External data format::
691
commit that is to be annotated.
692
+
693
....
694
- 'N' SP <dataref> SP <committish> LF
694
+ 'N' SP <dataref> SP <commit-ish> LF
695
....
696
+
697
Here `<dataref>` can be either a mark reference (`:<idnum>`)
@@ -704,13 +704,13 @@ Inline data format::
704
command.
705
+
706
....
707
- 'N' SP 'inline' SP <committish> LF
707
+ 'N' SP 'inline' SP <commit-ish> LF
708
data
709
....
710
+
711
See below for a detailed description of the `data` command.
712
713
-In both formats `<committish>` is any of the commit specification
713
+In both formats `<commit-ish>` is any of the commit specification
714
expressions also accepted by `from` (see above).
715
716
`mark`
@@ -741,7 +741,7 @@ lightweight (non-annotated) tags see the `reset` command below.
741
742
....
743
'tag' SP <name> LF
744
- 'from' SP <committish> LF
744
+ 'from' SP <commit-ish> LF
745
'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
746
data
747
....
@@ -786,11 +786,11 @@ branch from an existing commit without creating a new commit.
786
787
....
788
'reset' SP <ref> LF
789
- ('from' SP <committish> LF)?
789
+ ('from' SP <commit-ish> LF)?
790
LF?
791
....
792
793
-For a detailed description of `<ref>` and `<committish>` see above
793
+For a detailed description of `<ref>` and `<commit-ish>` see above
794
under `commit` and `from`.
795
796
The `LF` after the command is optional (it used to be required).
Documentation/git-name-rev.txt
+1
-1
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
'git name-rev' [--tags] [--refs=<pattern>]
13
- ( --all | --stdin | <committish>... )
13
+ ( --all | --stdin | <commit-ish>... )
14
15
DESCRIPTION
16
-----------
Documentation/git-push.txt
+1
-1
@@ -120,7 +120,7 @@ already exists on the remote side.
120
--follow-tags::
121
Push all the refs that would be pushed without this option,
122
and also push annotated tags in `refs/tags` that are missing
123
- from the remote but are pointing at committish that are
123
+ from the remote but are pointing at commit-ish that are
124
reachable from the refs being pushed.
125
126
--receive-pack=<git-receive-pack>::
Documentation/gitcli.txt
+1
-1
@@ -106,7 +106,7 @@ couple of magic command line options:
106
+
107
---------------------------------------------
108
$ git describe -h
109
-usage: git describe [options] <committish>*
109
+usage: git describe [options] <commit-ish>*
110
or: git describe [options] --dirty
111
112
--contains find the tag that comes after the commit
Documentation/howto/revert-branch-rebase.txt
+1
-1
@@ -154,7 +154,7 @@ $ git pull . master
154
Packing 0 objects
155
Unpacking 0 objects
156
157
-* committish: e3a693c... refs/heads/master from .
157
+* commit-ish: e3a693c... refs/heads/master from .
158
Trying to merge e3a693c... into 8c1f5f0... using 10d781b...
159
Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
160
cache.h | 8 ++++----
builtin/describe.c
+2
-2
@@ -13,7 +13,7 @@
13
#define MAX_TAGS (FLAG_BITS - 1)
14
15
static const char * const describe_usage[] = {
16
- N_("git describe [options] <committish>*"),
16
+ N_("git describe [options] <commit-ish>*"),
17
N_("git describe [options] --dirty"),
18
NULL
19
};
@@ -486,7 +486,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
486
}
487
describe("HEAD", 1);
488
} else if (dirty) {
489
- die(_("--dirty is incompatible with committishes"));
489
+ die(_("--dirty is incompatible with commit-ishes"));
490
} else {
491
while (argc-- > 0) {
492
describe(*argv++, argc == 0);
builtin/merge.c
+1
-1
@@ -1193,7 +1193,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1193
* This could be traditional "merge <msg> HEAD <commit>..." and
1194
* the way we can tell it is to see if the second token is HEAD,
1195
* but some people might have misused the interface and used a
1196
- * committish that is the same as HEAD there instead.
1196
+ * commit-ish that is the same as HEAD there instead.
1197
* Traditional format never would have "-m" so it is an
1198
* additional safety measure to check for it.
1199
*/
contrib/examples/git-merge.sh
+1
-1
@@ -263,7 +263,7 @@ fi
263
264
# This could be traditional "merge <msg> HEAD <commit>..." and the
265
# way we can tell it is to see if the second token is HEAD, but some
266
-# people might have misused the interface and used a committish that
266
+# people might have misused the interface and used a commit-ish that
267
# is the same as HEAD there instead. Traditional format never would
268
# have "-m" so it is an additional safety measure to check for it.
269
fast-import.c
+8
-8
@@ -22,8 +22,8 @@ Format of STDIN stream:
22
('author' (sp name)? sp '<' email '>' sp when lf)?
23
'committer' (sp name)? sp '<' email '>' sp when lf
24
commit_msg
25
- ('from' sp committish lf)?
26
- ('merge' sp committish lf)*
25
+ ('from' sp commit-ish lf)?
26
+ ('merge' sp commit-ish lf)*
27
(file_change | ls)*
28
lf?;
29
commit_msg ::= data;
@@ -43,18 +43,18 @@ Format of STDIN stream:
43
file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
44
file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
45
data;
46
- note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
47
- note_inm ::= 'N' sp 'inline' sp committish lf
46
+ note_obm ::= 'N' sp (hexsha1 | idnum) sp commit-ish lf;
47
+ note_inm ::= 'N' sp 'inline' sp commit-ish lf
48
data;
49
50
new_tag ::= 'tag' sp tag_str lf
51
- 'from' sp committish lf
51
+ 'from' sp commit-ish lf
52
('tagger' (sp name)? sp '<' email '>' sp when lf)?
53
tag_msg;
54
tag_msg ::= data;
55
56
reset_branch ::= 'reset' sp ref_str lf
57
- ('from' sp committish lf)?
57
+ ('from' sp commit-ish lf)?
58
lf?;
59
60
checkpoint ::= 'checkpoint' lf
@@ -93,7 +93,7 @@ Format of STDIN stream:
93
# stream formatting is: \, " and LF. Otherwise these values
94
# are UTF8.
95
#
96
- committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
96
+ commit-ish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
97
ref_str ::= ref;
98
sha1exp_str ::= sha1exp;
99
tag_str ::= tag;
@@ -2478,7 +2478,7 @@ static void note_change_n(struct branch *b, unsigned char *old_fanout)
2478
assert(*p == ' ');
2479
p++; /* skip space */
2480
2481
- /* <committish> */
2481
+ /* <commit-ish> */
2482
s = lookup_branch(p);
2483
if (s) {
2484
if (is_null_sha1(s->sha1))
po/da.po
+1
-1
@@ -1674,7 +1674,7 @@ msgid "No names found, cannot describe anything."
1674
msgstr ""
1675
1676
#: builtin/describe.c:482
1677
-msgid "--dirty is incompatible with committishes"
1677
+msgid "--dirty is incompatible with commit-ishes"
1678
msgstr ""
1679
1680
#: builtin/diff.c:77
po/de.po
+3
-3
@@ -4684,8 +4684,8 @@ msgid "print sizes in human readable format"
4684
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
4685
4686
#: builtin/describe.c:16
4687
-msgid "git describe [options] <committish>*"
4688
-msgstr "git describe [Optionen] <committish>*"
4687
+msgid "git describe [options] <commit-ish>*"
4688
+msgstr "git describe [Optionen] <commit-ish>*"
4689
4690
#: builtin/describe.c:17
4691
msgid "git describe [options] --dirty"
@@ -4822,7 +4822,7 @@ msgid "No names found, cannot describe anything."
4822
msgstr "Keine Namen gefunden, kann nichts beschreiben."
4823
4824
#: builtin/describe.c:489
4825
-msgid "--dirty is incompatible with committishes"
4825
+msgid "--dirty is incompatible with commit-ishes"
4826
msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
4827
4828
#: builtin/diff.c:79
po/fr.po
+2
-2
@@ -4222,7 +4222,7 @@ msgid "print sizes in human readable format"
4222
msgstr ""
4223
4224
#: builtin/describe.c:15
4225
-msgid "git describe [options] <committish>*"
4225
+msgid "git describe [options] <commit-ish>*"
4226
msgstr ""
4227
4228
#: builtin/describe.c:16
@@ -4348,7 +4348,7 @@ msgid "No names found, cannot describe anything."
4348
msgstr ""
4349
4350
#: builtin/describe.c:481
4351
-msgid "--dirty is incompatible with committishes"
4351
+msgid "--dirty is incompatible with commit-ishes"
4352
msgstr ""
4353
4354
#: builtin/diff.c:79
po/git.pot
+2
-2
@@ -4335,7 +4335,7 @@ msgid "print sizes in human readable format"
4335
msgstr ""
4336
4337
#: builtin/describe.c:16
4338
-msgid "git describe [options] <committish>*"
4338
+msgid "git describe [options] <commit-ish>*"
4339
msgstr ""
4340
4341
#: builtin/describe.c:17
@@ -4465,7 +4465,7 @@ msgid "No names found, cannot describe anything."
4465
msgstr ""
4466
4467
#: builtin/describe.c:489
4468
-msgid "--dirty is incompatible with committishes"
4468
+msgid "--dirty is incompatible with commit-ishes"
4469
msgstr ""
4470
4471
#: builtin/diff.c:79
po/it.po
+1
-1
@@ -2476,7 +2476,7 @@ msgid "No names found, cannot describe anything."
2476
msgstr ""
2477
2478
#: builtin/describe.c:482
2479
-msgid "--dirty is incompatible with committishes"
2479
+msgid "--dirty is incompatible with commit-ishes"
2480
msgstr ""
2481
2482
#: builtin/diff.c:77
po/nl.po
+1
-1
@@ -1669,7 +1669,7 @@ msgid "No names found, cannot describe anything."
1669
msgstr ""
1670
1671
#: builtin/describe.c:482
1672
-msgid "--dirty is incompatible with committishes"
1672
+msgid "--dirty is incompatible with commit-ishes"
1673
msgstr ""
1674
1675
#: builtin/diff.c:77
po/pt_PT.po
+1
-1
@@ -2312,7 +2312,7 @@ msgid "No names found, cannot describe anything."
2312
msgstr "Nenhum nome encontrado, não descreve nada."
2313
2314
#: builtin/describe.c:482
2315
-msgid "--dirty is incompatible with committishes"
2315
+msgid "--dirty is incompatible with commit-ishes"
2316
msgstr ""
2317
2318
#: builtin/diff.c:77
po/sv.po
+3
-3
@@ -4560,7 +4560,7 @@ msgid "print sizes in human readable format"
4560
msgstr "skriv storlekar i människoläsbart format"
4561
4562
#: builtin/describe.c:16
4563
-msgid "git describe [options] <committish>*"
4563
+msgid "git describe [options] <commit-ish>*"
4564
msgstr "git describe [flaggor] <incheckning-igt>*"
4565
4566
#: builtin/describe.c:17
@@ -4696,8 +4696,8 @@ msgid "No names found, cannot describe anything."
4696
msgstr "Inga namn hittades, kan inte beskriva något."
4697
4698
#: builtin/describe.c:489
4699
-msgid "--dirty is incompatible with committishes"
4700
-msgstr "--dirty är inkompatibelt med \"committish\"-värden"
4699
+msgid "--dirty is incompatible with commit-ishes"
4700
+msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
4701
4702
#: builtin/diff.c:79
4703
#, c-format
po/vi.po
+3
-3
@@ -4663,8 +4663,8 @@ msgid "print sizes in human readable format"
4663
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
4664
4665
#: builtin/describe.c:16
4666
-msgid "git describe [options] <committish>*"
4667
-msgstr "git describe [các-tùy-chọn] <committish>*"
4666
+msgid "git describe [options] <commit-ish>*"
4667
+msgstr "git describe [các-tùy-chọn] <commit-ish>*"
4668
4669
#: builtin/describe.c:17
4670
msgid "git describe [options] --dirty"
@@ -4799,7 +4799,7 @@ msgid "No names found, cannot describe anything."
4799
msgstr "Không tìm thấy các tên, không thể mô tả gì cả."
4800
4801
#: builtin/describe.c:489
4802
-msgid "--dirty is incompatible with committishes"
4802
+msgid "--dirty is incompatible with commit-ishes"
4803
msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)"
4804
4805
#: builtin/diff.c:79
po/zh_CN.po
+2
-2
@@ -4562,7 +4562,7 @@ msgid "print sizes in human readable format"
4562
msgstr "以用户可读的格式显示大小"
4563
4564
#: builtin/describe.c:16
4565
-msgid "git describe [options] <committish>*"
4565
+msgid "git describe [options] <commit-ish>*"
4566
msgstr "git describe [选项] <提交号>*"
4567
4568
#: builtin/describe.c:17
@@ -4698,7 +4698,7 @@ msgid "No names found, cannot describe anything."
4698
msgstr "没有发现名称，无法描述任何东西。"
4699
4700
#: builtin/describe.c:489
4701
-msgid "--dirty is incompatible with committishes"
4701
+msgid "--dirty is incompatible with commit-ishes"
4702
msgstr "--dirty 不能与提交同时使用"
4703
4704
#: builtin/diff.c:79
sha1_name.c
+3
-3
@@ -1130,13 +1130,13 @@ int get_sha1(const char *name, unsigned char *sha1)
1130
}
1131
1132
/*
1133
- * Many callers know that the user meant to name a committish by
1133
+ * Many callers know that the user meant to name a commit-ish by
1134
* syntactical positions where the object name appears. Calling this
1135
* function allows the machinery to disambiguate shorter-than-unique
1136
- * abbreviated object names between committish and others.
1136
+ * abbreviated object names between commit-ish and others.
1137
*
1138
* Note that this does NOT error out when the named object is not a
1139
- * committish. It is merely to give a hint to the disambiguation
1139
+ * commit-ish. It is merely to give a hint to the disambiguation
1140
* machinery.
1141
*/
1142
int get_sha1_committish(const char *name, unsigned char *sha1)
t/t9300-fast-import.sh
+3
-3
@@ -2815,14 +2815,14 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
2815
'
2816
2817
#
2818
-# notemodify, mark in committish
2818
+# notemodify, mark in commit-ish
2819
#
2820
-test_expect_success 'S: notemodify with garbarge after mark committish must fail' '
2820
+test_expect_success 'S: notemodify with garbarge after mark commit-ish must fail' '
2821
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2822
commit refs/heads/Snotes
2823
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2824
data <<COMMIT
2825
- commit S note committish
2825
+ commit S note commit-ish
2826
COMMIT
2827
N :202 :302x
2828
EOF