blob: 12cc403bd7eac3f3c195ce6533feee1865139bae [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"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07007#include "config.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -07008#include "object-store.h"
Stefan Bellerc1f5eb42018-06-28 18:21:59 -07009#include "repository.h"
Peter Eriksen8e440252006-04-02 14:44:09 +020010#include "commit.h"
11#include "tree.h"
Peter Eriksen6d96ac12006-05-23 14:15:33 +020012#include "builtin.h"
Johannes Schindelin9e832662006-12-22 22:06:08 +010013#include "utf8.h"
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070014#include "gpg-interface.h"
Linus Torvaldse83c5162005-04-07 15:13:13 -070015
Junio C Hamano33e8fc82015-10-16 11:27:42 -070016static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1>";
Junio C Hamanoc5bac172005-04-20 19:49:16 -070017
Nicolas Vigierd95bfb12013-11-05 00:14:41 +010018static const char *sign_commit;
19
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010020static void new_parent(struct commit *parent, struct commit_list **parents_p)
Linus Torvaldsb3892372005-06-19 10:40:10 -070021{
brian m. carlsonf2fd0762015-11-10 02:22:28 +000022 struct object_id *oid = &parent->object.oid;
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010023 struct commit_list *parents;
24 for (parents = *parents_p; parents; parents = parents->next) {
25 if (parents->item == parent) {
brian m. carlsonf2fd0762015-11-10 02:22:28 +000026 error("duplicate parent %s ignored", oid_to_hex(oid));
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010027 return;
Linus Torvaldsb3892372005-06-19 10:40:10 -070028 }
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010029 parents_p = &parents->next;
Linus Torvaldsb3892372005-06-19 10:40:10 -070030 }
Johannes Schindelinef98c5c2008-06-27 13:24:47 +010031 commit_list_insert(parent, parents_p);
Linus Torvaldsb3892372005-06-19 10:40:10 -070032}
33
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070034static int commit_tree_config(const char *var, const char *value, void *cb)
35{
36 int status = git_gpg_config(var, value, NULL);
37 if (status)
38 return status;
39 return git_default_config(var, value, cb);
40}
41
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020042int cmd_commit_tree(int argc, const char **argv, const char *prefix)
43{
Junio C Hamano79a93122011-11-09 11:33:55 -080044 int i, got_tree = 0;
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020045 struct commit_list *parents = NULL;
brian m. carlson031cee52016-09-05 20:08:10 +000046 struct object_id tree_oid;
47 struct object_id commit_oid;
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020048 struct strbuf buffer = STRBUF_INIT;
49
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070050 git_config(commit_tree_config, NULL);
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020051
Jonathan Nieder6e9daef2009-11-09 09:04:44 -060052 if (argc < 2 || !strcmp(argv[1], "-h"))
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020053 usage(commit_tree_usage);
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020054
Junio C Hamano79a93122011-11-09 11:33:55 -080055 for (i = 1; i < argc; i++) {
56 const char *arg = argv[i];
57 if (!strcmp(arg, "-p")) {
brian m. carlson031cee52016-09-05 20:08:10 +000058 struct object_id oid;
Junio C Hamano79a93122011-11-09 11:33:55 -080059 if (argc <= ++i)
60 usage(commit_tree_usage);
brian m. carlsone82caf32017-07-13 23:49:28 +000061 if (get_oid_commit(argv[i], &oid))
Junio C Hamano79a93122011-11-09 11:33:55 -080062 die("Not a valid object name %s", argv[i]);
brian m. carlsone816caa2018-03-12 02:27:42 +000063 assert_oid_type(&oid, OBJ_COMMIT);
Stefan Bellerc1f5eb42018-06-28 18:21:59 -070064 new_parent(lookup_commit(the_repository, &oid),
65 &parents);
Junio C Hamano79a93122011-11-09 11:33:55 -080066 continue;
67 }
Miklos Vajna7b9c0a62008-07-01 04:37:49 +020068
Brandon Richardson70ddbd72019-01-19 19:23:34 -040069 if (!strcmp(arg, "--gpg-sign")) {
70 sign_commit = "";
71 continue;
72 }
73
74 if (skip_prefix(arg, "-S", &sign_commit) ||
75 skip_prefix(arg, "--gpg-sign=", &sign_commit))
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070076 continue;
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070077
Junio C Hamano55ca3f92013-12-13 15:40:35 -080078 if (!strcmp(arg, "--no-gpg-sign")) {
79 sign_commit = NULL;
80 continue;
81 }
82
Junio C Hamano96b8d932011-11-09 11:54:04 -080083 if (!strcmp(arg, "-m")) {
84 if (argc <= ++i)
85 usage(commit_tree_usage);
86 if (buffer.len)
87 strbuf_addch(&buffer, '\n');
88 strbuf_addstr(&buffer, argv[i]);
89 strbuf_complete_line(&buffer);
90 continue;
91 }
92
93 if (!strcmp(arg, "-F")) {
94 int fd;
95
96 if (argc <= ++i)
97 usage(commit_tree_usage);
98 if (buffer.len)
99 strbuf_addch(&buffer, '\n');
100 if (!strcmp(argv[i], "-"))
101 fd = 0;
102 else {
103 fd = open(argv[i], O_RDONLY);
104 if (fd < 0)
105 die_errno("git commit-tree: failed to open '%s'",
106 argv[i]);
107 }
108 if (strbuf_read(&buffer, fd, 0) < 0)
109 die_errno("git commit-tree: failed to read '%s'",
110 argv[i]);
111 if (fd && close(fd))
112 die_errno("git commit-tree: failed to close '%s'",
113 argv[i]);
Junio C Hamano96b8d932011-11-09 11:54:04 -0800114 continue;
115 }
116
brian m. carlsone82caf32017-07-13 23:49:28 +0000117 if (get_oid_tree(arg, &tree_oid))
Junio C Hamano79a93122011-11-09 11:33:55 -0800118 die("Not a valid object name %s", arg);
119 if (got_tree)
120 die("Cannot give more than one trees");
121 got_tree = 1;
Miklos Vajna7b9c0a62008-07-01 04:37:49 +0200122 }
123
Junio C Hamano96b8d932011-11-09 11:54:04 -0800124 if (!buffer.len) {
125 if (strbuf_read(&buffer, 0, 0) < 0)
126 die_errno("git commit-tree: failed to read");
127 }
Miklos Vajna7b9c0a62008-07-01 04:37:49 +0200128
Patryk Obara5078f342018-01-28 01:13:16 +0100129 if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid,
130 NULL, sign_commit)) {
Jonathan Nieder79bc2af2010-10-02 03:41:00 -0500131 strbuf_release(&buffer);
Junio C Hamano7561d9f2006-03-24 22:23:25 -0800132 return 1;
Jonathan Nieder79bc2af2010-10-02 03:41:00 -0500133 }
134
brian m. carlson031cee52016-09-05 20:08:10 +0000135 printf("%s\n", oid_to_hex(&commit_oid));
Jonathan Nieder79bc2af2010-10-02 03:41:00 -0500136 strbuf_release(&buffer);
137 return 0;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700138}