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>

diff --git a/Documentation/RelNotes/1.7.11.2.txt b/Documentation/RelNotes/1.7.11.2.txt
index a0d24d1270dd76b8d3226ef56c8eb246df0323b9..f0cfd02d6ff318a614333929ec130c3aac7799aa 100644 (file)
--- a/Documentation/RelNotes/1.7.11.2.txt
+++ b/Documentation/RelNotes/1.7.11.2.txt
@@ -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
  * "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
 
  * When "git log" gets "--simplify-merges/by-decoration" together with
    "--first-parent", the combination of these options makes the

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 10fbc6a373758437f23ef80245b3bd9e164add1f..e468cebf3193591430484e28f56225c158385592 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -54,7 +54,7 @@ OPTIONS
 
 --textconv::
        Show the content as transformed by a textconv filter. In this case,
 
 --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::
        to apply the filter to the content recorded in the index at <path>.
 
 --batch::

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index c5f84b649504f1708be9cd925023af3afd685337..58731c194229e7e14b4eca27465fd42894d9a710 100644 (file)
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -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
 what three-way 'git read-tree -m' does, but instead of storing the
 results in the index, the command outputs the entries to the
 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

diff --git a/fast-import.c b/fast-import.c
index 23f625f561dfd664a460827d507e7c0b720e9849..019be11be7d9414a57e181f6afa5164d52f62d7e 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -2957,7 +2957,7 @@ static struct object_entry *dereference(struct object_entry *oe,
        case OBJ_TAG:
                break;
        default:
        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 */
        }
 
        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};
 
        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)
        p = command_buf.buf + strlen("ls ");
        if (*p == '"') {
                if (!b)

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index a0d796e57087e0ca5bac94520997ecacec9fd295..a9f6f8ebd443a338509f9c100e2d5c056c9f889f 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -4338,7 +4338,7 @@ sub getAnyHead
 =head2 getRevisionDirMap
 
 A "revision dir map" contains all the plain-file filenames associated
 =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}
 
 
   $type = $out->{$dir}{$fullName}
 

diff --git a/test-match-trees.c b/test-match-trees.c
index a3c4688778d9db28c83c9149c9cff1609b69b93f..2ef725e5ff94c4db59fdc4b389ee2399854cb83b 100644 (file)
--- a/test-match-trees.c
+++ b/test-match-trees.c
@@ -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("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)
        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));
 
        shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
        printf("shifted: %s\n", sha1_to_hex(shifted));