зеркало из https://github.com/microsoft/git.git
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:
Родитель
406fde17da
Коммит
bb8040f9f9
|
@ -31,7 +31,7 @@ Fixes since v1.7.11.1
|
|||
* "git diff --no-index" did not work with pagers correctly.
|
||||
|
||||
* "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
|
||||
"--first-parent", the combination of these options makes the
|
||||
|
|
|
@ -54,7 +54,7 @@ OPTIONS
|
|||
|
||||
--textconv::
|
||||
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>.
|
||||
|
||||
--batch::
|
||||
|
|
|
@ -13,7 +13,7 @@ SYNOPSIS
|
|||
|
||||
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
|
||||
what three-way 'git read-tree -m' does, but instead of storing the
|
||||
results in the index, the command outputs the entries to the
|
||||
|
|
|
@ -2957,7 +2957,7 @@ static struct object_entry *dereference(struct object_entry *oe,
|
|||
case OBJ_TAG:
|
||||
break;
|
||||
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 */
|
||||
|
@ -3041,7 +3041,7 @@ static void parse_ls(struct branch *b)
|
|||
struct tree_entry *root = NULL;
|
||||
struct tree_entry leaf = {NULL};
|
||||
|
||||
/* ls SP (<treeish> SP)? <path> */
|
||||
/* ls SP (<tree-ish> SP)? <path> */
|
||||
p = command_buf.buf + strlen("ls ");
|
||||
if (*p == '"') {
|
||||
if (!b)
|
||||
|
|
|
@ -4338,7 +4338,7 @@ sub getAnyHead
|
|||
=head2 getRevisionDirMap
|
||||
|
||||
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}
|
||||
|
||||
|
|
|
@ -12,10 +12,10 @@ int main(int ac, char **av)
|
|||
die("cannot parse %s as an object name", av[2]);
|
||||
one = parse_tree_indirect(hash1);
|
||||
if (!one)
|
||||
die("not a treeish %s", av[1]);
|
||||
die("not a tree-ish %s", av[1]);
|
||||
two = parse_tree_indirect(hash2);
|
||||
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);
|
||||
printf("shifted: %s\n", sha1_to_hex(shifted));
|
||||
|
|
Загрузка…
Ссылка в новой задаче