From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jul 2012 20:10:49 +0000 (-0700)
Subject: Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree
X-Git-Tag: v1.7.11.4~3^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53bcf22afa3a7d02de39679e85b6d1be08331f8c?ds=inline;hp=-c

Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree

* kk/maint-1.7.9-commit-tree:
commit-tree: resurrect command line parsing updates
---

53bcf22afa3a7d02de39679e85b6d1be08331f8c
diff --combined builtin/commit-tree.c
index 164b655df9,792670a9d1..a0df12ce16
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@@ -48,9 -48,6 +48,6 @@@ int cmd_commit_tree(int argc, const cha
  	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")) {
@@@ -116,7 -113,7 +113,7 @@@
  			die_errno("git commit-tree: failed to read");
  	}
  
 -	if (commit_tree(buffer.buf, tree_sha1, parents, commit_sha1,
 +	if (commit_tree(&buffer, tree_sha1, parents, commit_sha1,
  			NULL, sign_commit)) {
  		strbuf_release(&buffer);
  		return 1;