summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorRichard Hansen <rhansen@bbn.com>2013-09-04 19:04:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-04 22:02:56 (GMT)
commitbb8040f9f9274d739b894230959134584b156ae5 (patch)
treef7684c21fbba555276e9069662f4c887fbe67910 /fast-import.c
parent406fde17da450036acc35316c085e32bbd73ebc1 (diff)
downloadgit-bb8040f9f9274d739b894230959134584b156ae5.zip
git-bb8040f9f9274d739b894230959134584b156ae5.tar.gz
git-bb8040f9f9274d739b894230959134584b156ae5.tar.bz2
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>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index 23f625f..019be11 100644
--- 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:
- 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)