summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-17 20:05:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-17 20:05:13 (GMT)
commit9aab1b511892b7af86c037b49ff80ec5b4b2c191 (patch)
treedc273435ce5dba033fb76beb6ba9f59d0b2f2532 /builtin/commit-tree.c
parentba3c69a9ee1894de397b60d3b548383e13ef49e3 (diff)
downloadgit-9aab1b511892b7af86c037b49ff80ec5b4b2c191.zip
git-9aab1b511892b7af86c037b49ff80ec5b4b2c191.tar.gz
git-9aab1b511892b7af86c037b49ff80ec5b4b2c191.tar.bz2
commit-tree: resurrect command line parsing updates
79a9312 (commit-tree: update the command line parsing, 2011-11-09) updated the command line parser to understand the usual "flags first and then non-flag arguments" order, in addition to the original and a bit unusual "tree comes first and then zero or more -p <parent>". Unfortunately, ba3c69a (commit: teach --gpg-sign option, 2011-10-05) broke it by mistake. Resurrect it, and protect the feature with a test from future breakages. Noticed by Keshav Kini Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index d5e19af..792670a 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -48,9 +48,6 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
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]);
-
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (!strcmp(arg, "-p")) {