Merge branch 'kk/maint-commit-tree'

* kk/maint-commit-tree:
Revert "git-commit-tree(1): update synopsis"
commit-tree: resurrect command line parsing updates

diff --combined builtin/commit-tree.c
index cb982c550332abc846eee690f8e33c66db742053,a0df12ce16abda416fc9f33448bc895e74f4b0d1..eac901a0ee15f72eacffea32d1b327c7a336f19c
--- 1/builtin/commit-tree.c
--- 2/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@@ -48,16 -48,13 +48,13 @@@ int cmd_commit_tree(int argc, const cha
        if (argc < 2 || !strcmp(argv[1], "-h"))
                usage(commit_tree_usage);
  
-       if (get_sha1_tree(argv[1], tree_sha1))
-               die("Not a valid tree object name %s", argv[1]);
- 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                if (!strcmp(arg, "-p")) {
                        unsigned char sha1[20];
                        if (argc <= ++i)
                                usage(commit_tree_usage);
 -                      if (get_sha1(argv[i], sha1))
 +                      if (get_sha1_commit(argv[i], sha1))
                                die("Not a valid object name %s", argv[i]);
                        assert_sha1_type(sha1, OBJ_COMMIT);
                        new_parent(lookup_commit(sha1), &parents);
@@@ -104,7 -101,7 +101,7 @@@
                        continue;
                }
  
 -              if (get_sha1(arg, tree_sha1))
 +              if (get_sha1_tree(arg, tree_sha1))
                        die("Not a valid object name %s", arg);
                if (got_tree)
                        die("Cannot give more than one trees");