Merge branch 'jn/maint-gitweb-invalid-regexp' into maint
[git] / builtin / commit-tree.c
1 /*
2  * GIT - The information manager from hell
3  *
4  * Copyright (C) Linus Torvalds, 2005
5  */
6 #include "cache.h"
7 #include "commit.h"
8 #include "tree.h"
9 #include "builtin.h"
10 #include "utf8.h"
11 #include "gpg-interface.h"
12
13 static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S<signer>] [-m <message>] [-F <file>] <sha1> <changelog";
14
15 static void new_parent(struct commit *parent, struct commit_list **parents_p)
16 {
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));
22                         return;
23                 }
24                 parents_p = &parents->next;
25         }
26         commit_list_insert(parent, parents_p);
27 }
28
29 static int commit_tree_config(const char *var, const char *value, void *cb)
30 {
31         int status = git_gpg_config(var, value, NULL);
32         if (status)
33                 return status;
34         return git_default_config(var, value, cb);
35 }
36
37 int cmd_commit_tree(int argc, const char **argv, const char *prefix)
38 {
39         int i, got_tree = 0;
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;
45
46         git_config(commit_tree_config, NULL);
47
48         if (argc < 2 || !strcmp(argv[1], "-h"))
49                 usage(commit_tree_usage);
50
51         if (get_sha1(argv[1], tree_sha1))
52                 die("Not a valid object name %s", argv[1]);
53
54         for (i = 1; i < argc; i++) {
55                 const char *arg = argv[i];
56                 if (!strcmp(arg, "-p")) {
57                         unsigned char sha1[20];
58                         if (argc <= ++i)
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);
64                         continue;
65                 }
66
67                 if (!memcmp(arg, "-S", 2)) {
68                         sign_commit = arg + 2;
69                         continue;
70                 }
71
72                 if (!strcmp(arg, "-m")) {
73                         if (argc <= ++i)
74                                 usage(commit_tree_usage);
75                         if (buffer.len)
76                                 strbuf_addch(&buffer, '\n');
77                         strbuf_addstr(&buffer, argv[i]);
78                         strbuf_complete_line(&buffer);
79                         continue;
80                 }
81
82                 if (!strcmp(arg, "-F")) {
83                         int fd;
84
85                         if (argc <= ++i)
86                                 usage(commit_tree_usage);
87                         if (buffer.len)
88                                 strbuf_addch(&buffer, '\n');
89                         if (!strcmp(argv[i], "-"))
90                                 fd = 0;
91                         else {
92                                 fd = open(argv[i], O_RDONLY);
93                                 if (fd < 0)
94                                         die_errno("git commit-tree: failed to open '%s'",
95                                                   argv[i]);
96                         }
97                         if (strbuf_read(&buffer, fd, 0) < 0)
98                                 die_errno("git commit-tree: failed to read '%s'",
99                                           argv[i]);
100                         if (fd && close(fd))
101                                 die_errno("git commit-tree: failed to close '%s'",
102                                           argv[i]);
103                         strbuf_complete_line(&buffer);
104                         continue;
105                 }
106
107                 if (get_sha1(arg, tree_sha1))
108                         die("Not a valid object name %s", arg);
109                 if (got_tree)
110                         die("Cannot give more than one trees");
111                 got_tree = 1;
112         }
113
114         if (!buffer.len) {
115                 if (strbuf_read(&buffer, 0, 0) < 0)
116                         die_errno("git commit-tree: failed to read");
117         }
118
119         if (commit_tree(&buffer, tree_sha1, parents, commit_sha1,
120                         NULL, sign_commit)) {
121                 strbuf_release(&buffer);
122                 return 1;
123         }
124
125         printf("%s\n", sha1_to_hex(commit_sha1));
126         strbuf_release(&buffer);
127         return 0;
128 }