summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-30 13:05:13 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-30 13:05:13 -0700
commit2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8 (patch)
treefdea44aea763a0dfa6c68f905101c892a2e65aad /builtin
parent70f6be7aa9a1f435d64df11ec92ff84982bfc581 (diff)
parent4b7518a4aa24339d53e04151ba6b337245527c03 (diff)
downloadgit-2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8.tar.gz
Merge branch 'kk/maint-commit-tree' into maint
"git commit-tree" learned a more natural "-p <parent> <tree>" order of arguments long time ago, but recently forgot it by mistake. * kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates
Diffstat (limited to 'builtin')
-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 164b655df9..a0df12ce16 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")) {