Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree
author
Junio C Hamano
<gitster@pobox.com>
Tue, 17 Jul 2012 20:10:49 +0000
(13:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 17 Jul 2012 20:10:49 +0000
(13:10 -0700)
* kk/maint-1.7.9-commit-tree:
commit-tree: resurrect command line parsing updates
1
2
builtin/commit-tree.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
d284367
9aab1b5
)
diff --combined
builtin/commit-tree.c
index 164b655df93fea1ec2f63f5238c1ad7a377c8385,792670a9d18bc8e5126fe56c8755f9ac036a7728..a0df12ce16abda416fc9f33448bc895e74f4b0d1
---
1
/
builtin/commit-tree.c
---
2
/
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;