Convert struct object to object_id
[git/git.git] / builtin / commit-tree.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c5163 6#include "cache.h"
8e440259
PE
7#include "commit.h"
8#include "tree.h"
6d96ac18 9#include "builtin.h"
9e832665 10#include "utf8.h"
ba3c69a9 11#include "gpg-interface.h"
e83c5163 12
33e8fc87 13static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1>";
c5bac17a 14
d95bfb12
NV
15static const char *sign_commit;
16
ef98c5ca 17static void new_parent(struct commit *parent, struct commit_list **parents_p)
b389237a 18{
f2fd0760 19 struct object_id *oid = &parent->object.oid;
ef98c5ca
JS
20 struct commit_list *parents;
21 for (parents = *parents_p; parents; parents = parents->next) {
22 if (parents->item == parent) {
f2fd0760 23 error("duplicate parent %s ignored", oid_to_hex(oid));
ef98c5ca 24 return;
b389237a 25 }
ef98c5ca 26 parents_p = &parents->next;
b389237a 27 }
ef98c5ca 28 commit_list_insert(parent, parents_p);
b389237a
LT
29}
30
ba3c69a9
JH
31static int commit_tree_config(const char *var, const char *value, void *cb)
32{
33 int status = git_gpg_config(var, value, NULL);
34 if (status)
35 return status;
d95bfb12
NV
36 if (!strcmp(var, "commit.gpgsign")) {
37 sign_commit = git_config_bool(var, value) ? "" : NULL;
38 return 0;
39 }
ba3c69a9
JH
40 return git_default_config(var, value, cb);
41}
42
7b9c0a69
MV
43int cmd_commit_tree(int argc, const char **argv, const char *prefix)
44{
79a9312c 45 int i, got_tree = 0;
7b9c0a69
MV
46 struct commit_list *parents = NULL;
47 unsigned char tree_sha1[20];
48 unsigned char commit_sha1[20];
49 struct strbuf buffer = STRBUF_INIT;
50
ba3c69a9 51 git_config(commit_tree_config, NULL);
7b9c0a69 52
6e9daeff 53 if (argc < 2 || !strcmp(argv[1], "-h"))
7b9c0a69 54 usage(commit_tree_usage);
7b9c0a69 55
79a9312c
JH
56 for (i = 1; i < argc; i++) {
57 const char *arg = argv[i];
58 if (!strcmp(arg, "-p")) {
59 unsigned char sha1[20];
60 if (argc <= ++i)
61 usage(commit_tree_usage);
75f5ac04 62 if (get_sha1_commit(argv[i], sha1))
79a9312c
JH
63 die("Not a valid object name %s", argv[i]);
64 assert_sha1_type(sha1, OBJ_COMMIT);
65 new_parent(lookup_commit(sha1), &parents);
66 continue;
67 }
7b9c0a69 68
8547e0f1 69 if (skip_prefix(arg, "-S", &sign_commit))
ba3c69a9 70 continue;
ba3c69a9 71
55ca3f99
JH
72 if (!strcmp(arg, "--no-gpg-sign")) {
73 sign_commit = NULL;
74 continue;
75 }
76
96b8d93a
JH
77 if (!strcmp(arg, "-m")) {
78 if (argc <= ++i)
79 usage(commit_tree_usage);
80 if (buffer.len)
81 strbuf_addch(&buffer, '\n');
82 strbuf_addstr(&buffer, argv[i]);
83 strbuf_complete_line(&buffer);
84 continue;
85 }
86
87 if (!strcmp(arg, "-F")) {
88 int fd;
89
90 if (argc <= ++i)
91 usage(commit_tree_usage);
92 if (buffer.len)
93 strbuf_addch(&buffer, '\n');
94 if (!strcmp(argv[i], "-"))
95 fd = 0;
96 else {
97 fd = open(argv[i], O_RDONLY);
98 if (fd < 0)
99 die_errno("git commit-tree: failed to open '%s'",
100 argv[i]);
101 }
102 if (strbuf_read(&buffer, fd, 0) < 0)
103 die_errno("git commit-tree: failed to read '%s'",
104 argv[i]);
105 if (fd && close(fd))
106 die_errno("git commit-tree: failed to close '%s'",
107 argv[i]);
108 strbuf_complete_line(&buffer);
109 continue;
110 }
111
75f5ac04 112 if (get_sha1_tree(arg, tree_sha1))
79a9312c
JH
113 die("Not a valid object name %s", arg);
114 if (got_tree)
115 die("Cannot give more than one trees");
116 got_tree = 1;
7b9c0a69
MV
117 }
118
96b8d93a
JH
119 if (!buffer.len) {
120 if (strbuf_read(&buffer, 0, 0) < 0)
121 die_errno("git commit-tree: failed to read");
122 }
7b9c0a69 123
3ffefb54
JK
124 if (commit_tree(buffer.buf, buffer.len, tree_sha1, parents,
125 commit_sha1, NULL, sign_commit)) {
79bc2af5 126 strbuf_release(&buffer);
7561d9f5 127 return 1;
79bc2af5
JN
128 }
129
130 printf("%s\n", sha1_to_hex(commit_sha1));
131 strbuf_release(&buffer);
132 return 0;
e83c5163 133}