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