From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2012 03:55:53 +0000 (-0700)
Subject: Merge branch 'kk/maint-commit-tree'
X-Git-Tag: v1.7.12-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a7fe78a8953a1c4d8abcb36f28133078a778b8d2?ds=inline;hp=-c

Merge branch 'kk/maint-commit-tree'

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

a7fe78a8953a1c4d8abcb36f28133078a778b8d2
diff --combined builtin/commit-tree.c
index cb982c5503,a0df12ce16..eac901a0ee
--- a/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");