2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
11 #include "gpg-interface.h"
13 static const char commit_tree_usage
[] = "git commit-tree [(-p <sha1>)...] [-S<signer>] [-m <message>] [-F <file>] <sha1> <changelog";
15 static void new_parent(struct commit
*parent
, struct commit_list
**parents_p
)
17 unsigned char *sha1
= parent
->object
.sha1
;
18 struct commit_list
*parents
;
19 for (parents
= *parents_p
; parents
; parents
= parents
->next
) {
20 if (parents
->item
== parent
) {
21 error("duplicate parent %s ignored", sha1_to_hex(sha1
));
24 parents_p
= &parents
->next
;
26 commit_list_insert(parent
, parents_p
);
29 static int commit_tree_config(const char *var
, const char *value
, void *cb
)
31 int status
= git_gpg_config(var
, value
, NULL
);
34 return git_default_config(var
, value
, cb
);
37 int cmd_commit_tree(int argc
, const char **argv
, const char *prefix
)
40 struct commit_list
*parents
= NULL
;
41 unsigned char tree_sha1
[20];
42 unsigned char commit_sha1
[20];
43 struct strbuf buffer
= STRBUF_INIT
;
44 const char *sign_commit
= NULL
;
46 git_config(commit_tree_config
, NULL
);
48 if (argc
< 2 || !strcmp(argv
[1], "-h"))
49 usage(commit_tree_usage
);
51 if (get_sha1(argv
[1], tree_sha1
))
52 die("Not a valid object name %s", argv
[1]);
54 for (i
= 1; i
< argc
; i
++) {
55 const char *arg
= argv
[i
];
56 if (!strcmp(arg
, "-p")) {
57 unsigned char sha1
[20];
59 usage(commit_tree_usage
);
60 if (get_sha1(argv
[i
], sha1
))
61 die("Not a valid object name %s", argv
[i
]);
62 assert_sha1_type(sha1
, OBJ_COMMIT
);
63 new_parent(lookup_commit(sha1
), &parents
);
67 if (!memcmp(arg
, "-S", 2)) {
68 sign_commit
= arg
+ 2;
72 if (!strcmp(arg
, "-m")) {
74 usage(commit_tree_usage
);
76 strbuf_addch(&buffer
, '\n');
77 strbuf_addstr(&buffer
, argv
[i
]);
78 strbuf_complete_line(&buffer
);
82 if (!strcmp(arg
, "-F")) {
86 usage(commit_tree_usage
);
88 strbuf_addch(&buffer
, '\n');
89 if (!strcmp(argv
[i
], "-"))
92 fd
= open(argv
[i
], O_RDONLY
);
94 die_errno("git commit-tree: failed to open '%s'",
97 if (strbuf_read(&buffer
, fd
, 0) < 0)
98 die_errno("git commit-tree: failed to read '%s'",
101 die_errno("git commit-tree: failed to close '%s'",
103 strbuf_complete_line(&buffer
);
107 if (get_sha1(arg
, tree_sha1
))
108 die("Not a valid object name %s", arg
);
110 die("Cannot give more than one trees");
115 if (strbuf_read(&buffer
, 0, 0) < 0)
116 die_errno("git commit-tree: failed to read");
119 if (commit_tree(&buffer
, tree_sha1
, parents
, commit_sha1
,
120 NULL
, sign_commit
)) {
121 strbuf_release(&buffer
);
125 printf("%s\n", sha1_to_hex(commit_sha1
));
126 strbuf_release(&buffer
);