mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 03:46:08 +02:00
Code

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 <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Richard Hansen 2013-09-04 15:04:30 -04:00 committed by Junio C Hamano
parent 406fde17da
commit bb8040f9f9
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/RelNotes/1.7.11.2.txt
View File

@ -31,7 +31,7 @@ Fixes since v1.7.11.1
* "git diff --no-index" did not work with pagers correctly. * "git diff --no-index" did not work with pagers correctly.
* "git diff COPYING HEAD:COPYING" gave a nonsense error message that * "git diff COPYING HEAD:COPYING" gave a nonsense error message that
claimed that the treeish HEAD did not have COPYING in it. claimed that the tree-ish HEAD did not have COPYING in it.
* When "git log" gets "--simplify-merges/by-decoration" together with * When "git log" gets "--simplify-merges/by-decoration" together with
"--first-parent", the combination of these options makes the "--first-parent", the combination of these options makes the

2
Documentation/git-cat-file.txt
View File

@ -54,7 +54,7 @@ OPTIONS
--textconv:: --textconv::
Show the content as transformed by a textconv filter. In this case, Show the content as transformed by a textconv filter. In this case,
<object> has be of the form <treeish>:<path>, or :<path> in order <object> has be of the form <tree-ish>:<path>, or :<path> in order
to apply the filter to the content recorded in the index at <path>. to apply the filter to the content recorded in the index at <path>.
--batch:: --batch::

2
Documentation/git-merge-tree.txt
View File

@ -13,7 +13,7 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
Reads three treeish, and output trivial merge results and Reads three tree-ish, and output trivial merge results and
conflicting stages to the standard output. This is similar to conflicting stages to the standard output. This is similar to
what three-way 'git read-tree -m' does, but instead of storing the what three-way 'git read-tree -m' does, but instead of storing the
results in the index, the command outputs the entries to the results in the index, the command outputs the entries to the

4
fast-import.c
View File

@ -2957,7 +2957,7 @@ static struct object_entry *dereference(struct object_entry *oe,
case OBJ_TAG: case OBJ_TAG:
break; break;
default: default:
die("Not a treeish: %s", command_buf.buf); die("Not a tree-ish: %s", command_buf.buf);
} }
if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */ if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
@ -3041,7 +3041,7 @@ static void parse_ls(struct branch *b)
struct tree_entry *root = NULL; struct tree_entry *root = NULL;
struct tree_entry leaf = {NULL}; struct tree_entry leaf = {NULL};
/* ls SP (<treeish> SP)? <path> */ /* ls SP (<tree-ish> SP)? <path> */
p = command_buf.buf + strlen("ls "); p = command_buf.buf + strlen("ls ");
if (*p == '"') { if (*p == '"') {
if (!b) if (!b)

2
git-cvsserver.perl
View File

@ -4338,7 +4338,7 @@ sub getAnyHead
=head2 getRevisionDirMap =head2 getRevisionDirMap
A "revision dir map" contains all the plain-file filenames associated A "revision dir map" contains all the plain-file filenames associated
with a particular revision (treeish), organized by directory: with a particular revision (tree-ish), organized by directory:
$type = $out->{$dir}{$fullName} $type = $out->{$dir}{$fullName}

4
test-match-trees.c
View File

@ -12,10 +12,10 @@ int main(int ac, char **av)
die("cannot parse %s as an object name", av[2]); die("cannot parse %s as an object name", av[2]);
one = parse_tree_indirect(hash1); one = parse_tree_indirect(hash1);
if (!one) if (!one)
die("not a treeish %s", av[1]); die("not a tree-ish %s", av[1]);
two = parse_tree_indirect(hash2); two = parse_tree_indirect(hash2);
if (!two) if (!two)
die("not a treeish %s", av[2]); die("not a tree-ish %s", av[2]);
shift_tree(one->object.sha1, two->object.sha1, shifted, -1); shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
printf("shifted: %s\n", sha1_to_hex(shifted)); printf("shifted: %s\n", sha1_to_hex(shifted));