Skip to content

Commit bb8040f

Browse files
rhansengitster
authored andcommitted
use 'tree-ish' instead of 'treeish'
Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * "(also treeish)" in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 406fde1 commit bb8040f

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Documentation/RelNotes/1.7.11.2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Fixes since v1.7.11.1
3131
* "git diff --no-index" did not work with pagers correctly.
3232

3333
* "git diff COPYING HEAD:COPYING" gave a nonsense error message that
34-
claimed that the treeish HEAD did not have COPYING in it.
34+
claimed that the tree-ish HEAD did not have COPYING in it.
3535

3636
* When "git log" gets "--simplify-merges/by-decoration" together with
3737
"--first-parent", the combination of these options makes the

Documentation/git-cat-file.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPTIONS
5454

5555
--textconv::
5656
Show the content as transformed by a textconv filter. In this case,
57-
<object> has be of the form <treeish>:<path>, or :<path> in order
57+
<object> has be of the form <tree-ish>:<path>, or :<path> in order
5858
to apply the filter to the content recorded in the index at <path>.
5959

6060
--batch::

Documentation/git-merge-tree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SYNOPSIS
1313

1414
DESCRIPTION
1515
-----------
16-
Reads three treeish, and output trivial merge results and
16+
Reads three tree-ish, and output trivial merge results and
1717
conflicting stages to the standard output. This is similar to
1818
what three-way 'git read-tree -m' does, but instead of storing the
1919
results in the index, the command outputs the entries to the

fast-import.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,7 +2957,7 @@ static struct object_entry *dereference(struct object_entry *oe,
29572957
case OBJ_TAG:
29582958
break;
29592959
default:
2960-
die("Not a treeish: %s", command_buf.buf);
2960+
die("Not a tree-ish: %s", command_buf.buf);
29612961
}
29622962

29632963
if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
@@ -3041,7 +3041,7 @@ static void parse_ls(struct branch *b)
30413041
struct tree_entry *root = NULL;
30423042
struct tree_entry leaf = {NULL};
30433043

3044-
/* ls SP (<treeish> SP)? <path> */
3044+
/* ls SP (<tree-ish> SP)? <path> */
30453045
p = command_buf.buf + strlen("ls ");
30463046
if (*p == '"') {
30473047
if (!b)

git-cvsserver.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4338,7 +4338,7 @@ sub getAnyHead
43384338
=head2 getRevisionDirMap
43394339
43404340
A "revision dir map" contains all the plain-file filenames associated
4341-
with a particular revision (treeish), organized by directory:
4341+
with a particular revision (tree-ish), organized by directory:
43424342
43434343
$type = $out->{$dir}{$fullName}
43444344

test-match-trees.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ int main(int ac, char **av)
1212
die("cannot parse %s as an object name", av[2]);
1313
one = parse_tree_indirect(hash1);
1414
if (!one)
15-
die("not a treeish %s", av[1]);
15+
die("not a tree-ish %s", av[1]);
1616
two = parse_tree_indirect(hash2);
1717
if (!two)
18-
die("not a treeish %s", av[2]);
18+
die("not a tree-ish %s", av[2]);
1919

2020
shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
2121
printf("shifted: %s\n", sha1_to_hex(shifted));

0 commit comments

Comments
 (0)