Linus Torvalds | 8bc9a0c | 2005-04-07 15:16:10 -0700 | [diff] [blame] | 1 | /* |
| 2 | * GIT - The information manager from hell |
| 3 | * |
| 4 | * Copyright (C) Linus Torvalds, 2005 |
| 5 | */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 6 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 7 | #include "config.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 8 | #include "object-store.h" |
Stefan Beller | c1f5eb4 | 2018-06-28 18:21:59 -0700 | [diff] [blame] | 9 | #include "repository.h" |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 10 | #include "commit.h" |
| 11 | #include "tree.h" |
Peter Eriksen | 6d96ac1 | 2006-05-23 14:15:33 +0200 | [diff] [blame] | 12 | #include "builtin.h" |
Johannes Schindelin | 9e83266 | 2006-12-22 22:06:08 +0100 | [diff] [blame] | 13 | #include "utf8.h" |
Junio C Hamano | ba3c69a | 2011-10-05 17:23:20 -0700 | [diff] [blame] | 14 | #include "gpg-interface.h" |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 15 | |
Junio C Hamano | 33e8fc8 | 2015-10-16 11:27:42 -0700 | [diff] [blame] | 16 | static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1>"; |
Junio C Hamano | c5bac17 | 2005-04-20 19:49:16 -0700 | [diff] [blame] | 17 | |
Nicolas Vigier | d95bfb1 | 2013-11-05 00:14:41 +0100 | [diff] [blame] | 18 | static const char *sign_commit; |
| 19 | |
Johannes Schindelin | ef98c5c | 2008-06-27 13:24:47 +0100 | [diff] [blame] | 20 | static void new_parent(struct commit *parent, struct commit_list **parents_p) |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 21 | { |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 22 | struct object_id *oid = &parent->object.oid; |
Johannes Schindelin | ef98c5c | 2008-06-27 13:24:47 +0100 | [diff] [blame] | 23 | struct commit_list *parents; |
| 24 | for (parents = *parents_p; parents; parents = parents->next) { |
| 25 | if (parents->item == parent) { |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 26 | error("duplicate parent %s ignored", oid_to_hex(oid)); |
Johannes Schindelin | ef98c5c | 2008-06-27 13:24:47 +0100 | [diff] [blame] | 27 | return; |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 28 | } |
Johannes Schindelin | ef98c5c | 2008-06-27 13:24:47 +0100 | [diff] [blame] | 29 | parents_p = &parents->next; |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 30 | } |
Johannes Schindelin | ef98c5c | 2008-06-27 13:24:47 +0100 | [diff] [blame] | 31 | commit_list_insert(parent, parents_p); |
Linus Torvalds | b389237 | 2005-06-19 10:40:10 -0700 | [diff] [blame] | 32 | } |
| 33 | |
Junio C Hamano | ba3c69a | 2011-10-05 17:23:20 -0700 | [diff] [blame] | 34 | static 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 Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 42 | int cmd_commit_tree(int argc, const char **argv, const char *prefix) |
| 43 | { |
Junio C Hamano | 79a9312 | 2011-11-09 11:33:55 -0800 | [diff] [blame] | 44 | int i, got_tree = 0; |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 45 | struct commit_list *parents = NULL; |
brian m. carlson | 031cee5 | 2016-09-05 20:08:10 +0000 | [diff] [blame] | 46 | struct object_id tree_oid; |
| 47 | struct object_id commit_oid; |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 48 | struct strbuf buffer = STRBUF_INIT; |
| 49 | |
Junio C Hamano | ba3c69a | 2011-10-05 17:23:20 -0700 | [diff] [blame] | 50 | git_config(commit_tree_config, NULL); |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 51 | |
Jonathan Nieder | 6e9daef | 2009-11-09 09:04:44 -0600 | [diff] [blame] | 52 | if (argc < 2 || !strcmp(argv[1], "-h")) |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 53 | usage(commit_tree_usage); |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 54 | |
Junio C Hamano | 79a9312 | 2011-11-09 11:33:55 -0800 | [diff] [blame] | 55 | for (i = 1; i < argc; i++) { |
| 56 | const char *arg = argv[i]; |
| 57 | if (!strcmp(arg, "-p")) { |
brian m. carlson | 031cee5 | 2016-09-05 20:08:10 +0000 | [diff] [blame] | 58 | struct object_id oid; |
Junio C Hamano | 79a9312 | 2011-11-09 11:33:55 -0800 | [diff] [blame] | 59 | if (argc <= ++i) |
| 60 | usage(commit_tree_usage); |
brian m. carlson | e82caf3 | 2017-07-13 23:49:28 +0000 | [diff] [blame] | 61 | if (get_oid_commit(argv[i], &oid)) |
Junio C Hamano | 79a9312 | 2011-11-09 11:33:55 -0800 | [diff] [blame] | 62 | die("Not a valid object name %s", argv[i]); |
brian m. carlson | e816caa | 2018-03-12 02:27:42 +0000 | [diff] [blame] | 63 | assert_oid_type(&oid, OBJ_COMMIT); |
Stefan Beller | c1f5eb4 | 2018-06-28 18:21:59 -0700 | [diff] [blame] | 64 | new_parent(lookup_commit(the_repository, &oid), |
| 65 | &parents); |
Junio C Hamano | 79a9312 | 2011-11-09 11:33:55 -0800 | [diff] [blame] | 66 | continue; |
| 67 | } |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 68 | |
Brandon Richardson | 70ddbd7 | 2019-01-19 19:23:34 -0400 | [diff] [blame] | 69 | 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 Hamano | ba3c69a | 2011-10-05 17:23:20 -0700 | [diff] [blame] | 76 | continue; |
Junio C Hamano | ba3c69a | 2011-10-05 17:23:20 -0700 | [diff] [blame] | 77 | |
Junio C Hamano | 55ca3f9 | 2013-12-13 15:40:35 -0800 | [diff] [blame] | 78 | if (!strcmp(arg, "--no-gpg-sign")) { |
| 79 | sign_commit = NULL; |
| 80 | continue; |
| 81 | } |
| 82 | |
Junio C Hamano | 96b8d93 | 2011-11-09 11:54:04 -0800 | [diff] [blame] | 83 | 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 Hamano | 96b8d93 | 2011-11-09 11:54:04 -0800 | [diff] [blame] | 114 | continue; |
| 115 | } |
| 116 | |
brian m. carlson | e82caf3 | 2017-07-13 23:49:28 +0000 | [diff] [blame] | 117 | if (get_oid_tree(arg, &tree_oid)) |
Junio C Hamano | 79a9312 | 2011-11-09 11:33:55 -0800 | [diff] [blame] | 118 | 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 Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 122 | } |
| 123 | |
Junio C Hamano | 96b8d93 | 2011-11-09 11:54:04 -0800 | [diff] [blame] | 124 | if (!buffer.len) { |
| 125 | if (strbuf_read(&buffer, 0, 0) < 0) |
| 126 | die_errno("git commit-tree: failed to read"); |
| 127 | } |
Miklos Vajna | 7b9c0a6 | 2008-07-01 04:37:49 +0200 | [diff] [blame] | 128 | |
Patryk Obara | 5078f34 | 2018-01-28 01:13:16 +0100 | [diff] [blame] | 129 | if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid, |
| 130 | NULL, sign_commit)) { |
Jonathan Nieder | 79bc2af | 2010-10-02 03:41:00 -0500 | [diff] [blame] | 131 | strbuf_release(&buffer); |
Junio C Hamano | 7561d9f | 2006-03-24 22:23:25 -0800 | [diff] [blame] | 132 | return 1; |
Jonathan Nieder | 79bc2af | 2010-10-02 03:41:00 -0500 | [diff] [blame] | 133 | } |
| 134 | |
brian m. carlson | 031cee5 | 2016-09-05 20:08:10 +0000 | [diff] [blame] | 135 | printf("%s\n", oid_to_hex(&commit_oid)); |
Jonathan Nieder | 79bc2af | 2010-10-02 03:41:00 -0500 | [diff] [blame] | 136 | strbuf_release(&buffer); |
| 137 | return 0; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 138 | } |