summaryrefslogtreecommitdiff
path: root/builtin-cat-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-03 14:51:56 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-03 14:51:56 -0700
commit36f44a06802960abce7febbf9cc40461e5546ee5 (patch)
treed0001f04f2edfb3644c304626908f31d495cb17b /builtin-cat-file.c
parent73bae1dc468734bad3ff7d1b8e93e7ac5f9d3dff (diff)
parent47a528ad24185133867ebb5bb7692db2cb8bef39 (diff)
downloadgit-36f44a06802960abce7febbf9cc40461e5546ee5.tar.gz
Merge branch 'ho/dashless' into maint
* ho/dashless: tests: use "git xyzzy" form (t7200 - t9001) tests: use "git xyzzy" form (t7000 - t7199) tests: use "git xyzzy" form (t3600 - t6999) tests: use "git xyzzy" form (t0000 - t3599) 'git foo' program identifies itself without dash in die() messages Start conforming code to "git subcmd" style
Diffstat (limited to 'builtin-cat-file.c')
-rw-r--r--builtin-cat-file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 7441a56acd..3fba6b9e74 100644
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -137,11 +137,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
break;
default:
- die("git-cat-file: unknown option: %s\n", exp_type);
+ die("git cat-file: unknown option: %s\n", exp_type);
}
if (!buf)
- die("git-cat-file %s: bad file", obj_name);
+ die("git cat-file %s: bad file", obj_name);
write_or_die(1, buf, size);
return 0;