blob: 25aa2cdef3557c67a9482492a4d0294bc7b89b04 [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 15:16:10 -07001/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Linus Torvaldse83c5162005-04-07 15:13:13 -07006#include "cache.h"
Peter Eriksen8e440252006-04-02 14:44:09 +02007#include "commit.h"
8#include "tree.h"
Peter Eriksen6d96ac12006-05-23 14:15:33 +02009#include "builtin.h"
Johannes Schindelin9e832662006-12-22 22:06:08 +010010#include "utf8.h"
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070011#include "gpg-interface.h"
Linus Torvaldse83c5162005-04-07 15:13:13 -070012
Brad Kingdf45cb32013-03-25 17:00:07 -040013static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1> <changelog";
Junio C Hamanoc5bac172005-04-20 19:49:16 -070014
Nicolas Vigierd95bfb12013-11-05 00:14:41 +010015static const char *sign_commit;
16
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010017static void new_parent(struct commit *parent, struct commit_list **parents_p)
Linus Torvaldsb3892372005-06-19 10:40:10 -070018{
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010019 unsigned char *sha1 = parent->object.sha1;
20 struct commit_list *parents;
21 for (parents = *parents_p; parents; parents = parents->next) {
22 if (parents->item == parent) {
Linus Torvaldsb3892372005-06-19 10:40:10 -070023 error("duplicate parent %s ignored", sha1_to_hex(sha1));
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010024 return;
Linus Torvaldsb3892372005-06-19 10:40:10 -070025 }
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010026 parents_p = &parents->next;
Linus Torvaldsb3892372005-06-19 10:40:10 -070027 }
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010028 commit_list_insert(parent, parents_p);
Linus Torvaldsb3892372005-06-19 10:40:10 -070029}
30
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070031static 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;
Nicolas Vigierd95bfb12013-11-05 00:14:41 +010036 if (!strcmp(var, "commit.gpgsign")) {
37 sign_commit = git_config_bool(var, value) ? "" : NULL;
38 return 0;
39 }
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070040 return git_default_config(var, value, cb);
41}
42
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020043int cmd_commit_tree(int argc, const char **argv, const char *prefix)
44{
Junio C Hamano79a93122011-11-09 11:33:55 -080045 int i, got_tree = 0;
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020046 struct commit_list *parents = NULL;
47 unsigned char tree_sha1[20];
48 unsigned char commit_sha1[20];
49 struct strbuf buffer = STRBUF_INIT;
50
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070051 git_config(commit_tree_config, NULL);
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020052
Jonathan Nieder6e9daef2009-11-09 09:04:44 -060053 if (argc < 2 || !strcmp(argv[1], "-h"))
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020054 usage(commit_tree_usage);
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020055
Junio C Hamano79a93122011-11-09 11:33:55 -080056 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);
Junio C Hamano75f5ac02012-07-03 10:03:38 -070062 if (get_sha1_commit(argv[i], sha1))
Junio C Hamano79a93122011-11-09 11:33:55 -080063 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 }
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020068
René Scharfe8547e0f2014-12-24 01:18:11 +010069 if (skip_prefix(arg, "-S", &sign_commit))
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070070 continue;
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070071
Junio C Hamano55ca3f92013-12-13 15:40:35 -080072 if (!strcmp(arg, "--no-gpg-sign")) {
73 sign_commit = NULL;
74 continue;
75 }
76
Junio C Hamano96b8d932011-11-09 11:54:04 -080077 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
Junio C Hamano75f5ac02012-07-03 10:03:38 -0700112 if (get_sha1_tree(arg, tree_sha1))
Junio C Hamano79a93122011-11-09 11:33:55 -0800113 die("Not a valid object name %s", arg);
114 if (got_tree)
115 die("Cannot give more than one trees");
116 got_tree = 1;
Miklos Vajna7b9c0a62008-07-01 04:37:49 +0200117 }
118
Junio C Hamano96b8d932011-11-09 11:54:04 -0800119 if (!buffer.len) {
120 if (strbuf_read(&buffer, 0, 0) < 0)
121 die_errno("git commit-tree: failed to read");
122 }
Miklos Vajna7b9c0a62008-07-01 04:37:49 +0200123
Jeff King3ffefb52014-06-10 17:36:52 -0400124 if (commit_tree(buffer.buf, buffer.len, tree_sha1, parents,
125 commit_sha1, NULL, sign_commit)) {
Jonathan Nieder79bc2af2010-10-02 03:41:00 -0500126 strbuf_release(&buffer);
Junio C Hamano7561d9f2006-03-24 22:23:25 -0800127 return 1;
Jonathan Nieder79bc2af2010-10-02 03:41:00 -0500128 }
129
130 printf("%s\n", sha1_to_hex(commit_sha1));
131 strbuf_release(&buffer);
132 return 0;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700133}