summaryrefslogtreecommitdiff
path: root/builtin-commit-tree.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2009-11-09 09:04:44 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-09 17:08:44 -0800
commit6e9daeffec0213fa1cee76ad9d899fe492409f46 (patch)
tree68445ac56175df2ba17359e455f2f671d66b6129 /builtin-commit-tree.c
parentShow usage string for 'git cherry -h' (diff)
downloadtgif-6e9daeffec0213fa1cee76ad9d899fe492409f46.tar.xz
Show usage string for 'git commit-tree -h'
Treat an "-h" option as a request for help, rather than a "Not a valid object name" error. "commit-tree -h" could be asking to create a new commit from a treeish named "-h". Strictly speaking, such a pathological ref name is possible, but the user would have to had said something like "tags/-h" to name such a pathological already. commit-tree is usually used in scripts with raw object ids, anyway. For consistency, the "-h" option uses its new meaning even if followed by other arguments. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit-tree.c')
-rw-r--r--builtin-commit-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index 6467077731..ddcb7a4bbb 100644
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -105,7 +105,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
- if (argc < 2)
+ if (argc < 2 || !strcmp(argv[1], "-h"))
usage(commit_tree_usage);
if (get_sha1(argv[1], tree_sha1))
die("Not a valid object name %s", argv[1]);