]>
Commit | Line | Data |
---|---|---|
8f1d2e6f | 1 | #include "cache.h" |
961784ee | 2 | #include "tag.h" |
175785e5 | 3 | #include "commit.h" |
177722b3 | 4 | #include "commit-graph.h" |
ed09aef0 | 5 | #include "pkt-line.h" |
52883fbd | 6 | #include "utf8.h" |
199c45bf JH |
7 | #include "diff.h" |
8 | #include "revision.h" | |
a97a7468 | 9 | #include "notes.h" |
ba3c69a9 | 10 | #include "gpg-interface.h" |
46905893 | 11 | #include "mergesort.h" |
a84b794a | 12 | #include "commit-slab.h" |
da24b104 | 13 | #include "prio-queue.h" |
0a9136f3 | 14 | #include "sha1-lookup.h" |
d76650b8 | 15 | #include "wt-status.h" |
f9f99b3f | 16 | #include "advice.h" |
175785e5 | 17 | |
82a75299 JH |
18 | static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); |
19 | ||
60ab26de LT |
20 | int save_commit_buffer = 1; |
21 | ||
175785e5 DB |
22 | const char *commit_type = "commit"; |
23 | ||
bc83266a | 24 | struct commit *lookup_commit_reference_gently(const struct object_id *oid, |
f76412ed | 25 | int quiet) |
961784ee | 26 | { |
c251c83d | 27 | struct object *obj = deref_tag(parse_object(oid), NULL, 0); |
961784ee LT |
28 | |
29 | if (!obj) | |
30 | return NULL; | |
8ff226a9 | 31 | return object_as_type(obj, OBJ_COMMIT, quiet); |
f76412ed JH |
32 | } |
33 | ||
bc83266a | 34 | struct commit *lookup_commit_reference(const struct object_id *oid) |
f76412ed | 35 | { |
bc83266a | 36 | return lookup_commit_reference_gently(oid, 0); |
961784ee LT |
37 | } |
38 | ||
bc83266a | 39 | struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name) |
baf18fc2 | 40 | { |
bc83266a | 41 | struct commit *c = lookup_commit_reference(oid); |
baf18fc2 NTND |
42 | if (!c) |
43 | die(_("could not parse %s"), ref_name); | |
bc83266a | 44 | if (oidcmp(oid, &c->object.oid)) { |
baf18fc2 | 45 | warning(_("%s %s is not a commit!"), |
bc83266a | 46 | ref_name, oid_to_hex(oid)); |
baf18fc2 NTND |
47 | } |
48 | return c; | |
49 | } | |
50 | ||
bc83266a | 51 | struct commit *lookup_commit(const struct object_id *oid) |
175785e5 | 52 | { |
bc83266a | 53 | struct object *obj = lookup_object(oid->hash); |
d36f51c1 | 54 | if (!obj) |
bc83266a | 55 | return create_object(oid->hash, alloc_commit_node()); |
8ff226a9 | 56 | return object_as_type(obj, OBJ_COMMIT, 0); |
175785e5 DB |
57 | } |
58 | ||
a6fa5992 PN |
59 | struct commit *lookup_commit_reference_by_name(const char *name) |
60 | { | |
7683e2e6 | 61 | struct object_id oid; |
a6fa5992 PN |
62 | struct commit *commit; |
63 | ||
e82caf38 | 64 | if (get_oid_committish(name, &oid)) |
a6fa5992 | 65 | return NULL; |
bc83266a | 66 | commit = lookup_commit_reference(&oid); |
5e7d4d3e | 67 | if (parse_commit(commit)) |
a6fa5992 PN |
68 | return NULL; |
69 | return commit; | |
70 | } | |
71 | ||
dddbad72 | 72 | static timestamp_t parse_commit_date(const char *buf, const char *tail) |
175785e5 | 73 | { |
0a617799 | 74 | const char *dateptr; |
175785e5 | 75 | |
0a617799 MK |
76 | if (buf + 6 >= tail) |
77 | return 0; | |
175785e5 DB |
78 | if (memcmp(buf, "author", 6)) |
79 | return 0; | |
0a617799 | 80 | while (buf < tail && *buf++ != '\n') |
175785e5 | 81 | /* nada */; |
0a617799 MK |
82 | if (buf + 9 >= tail) |
83 | return 0; | |
175785e5 DB |
84 | if (memcmp(buf, "committer", 9)) |
85 | return 0; | |
0a617799 | 86 | while (buf < tail && *buf++ != '>') |
175785e5 | 87 | /* nada */; |
0a617799 MK |
88 | if (buf >= tail) |
89 | return 0; | |
90 | dateptr = buf; | |
91 | while (buf < tail && *buf++ != '\n') | |
92 | /* nada */; | |
93 | if (buf >= tail) | |
94 | return 0; | |
1aeb7e75 JS |
95 | /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */ |
96 | return parse_timestamp(dateptr, NULL, 10); | |
175785e5 DB |
97 | } |
98 | ||
5040f17e | 99 | static struct commit_graft **commit_graft; |
5da5c8f4 JH |
100 | static int commit_graft_alloc, commit_graft_nr; |
101 | ||
0a9136f3 DD |
102 | static const unsigned char *commit_graft_sha1_access(size_t index, void *table) |
103 | { | |
104 | struct commit_graft **commit_graft_table = table; | |
7683e2e6 | 105 | return commit_graft_table[index]->oid.hash; |
0a9136f3 DD |
106 | } |
107 | ||
5da5c8f4 JH |
108 | static int commit_graft_pos(const unsigned char *sha1) |
109 | { | |
0a9136f3 DD |
110 | return sha1_pos(sha1, commit_graft, commit_graft_nr, |
111 | commit_graft_sha1_access); | |
5da5c8f4 JH |
112 | } |
113 | ||
5040f17e JH |
114 | int register_commit_graft(struct commit_graft *graft, int ignore_dups) |
115 | { | |
7683e2e6 | 116 | int pos = commit_graft_pos(graft->oid.hash); |
a6080a0a | 117 | |
5040f17e JH |
118 | if (0 <= pos) { |
119 | if (ignore_dups) | |
120 | free(graft); | |
121 | else { | |
122 | free(commit_graft[pos]); | |
123 | commit_graft[pos] = graft; | |
124 | } | |
125 | return 1; | |
126 | } | |
127 | pos = -pos - 1; | |
d6e82b57 DD |
128 | ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc); |
129 | commit_graft_nr++; | |
5040f17e | 130 | if (pos < commit_graft_nr) |
f919ffeb SG |
131 | MOVE_ARRAY(commit_graft + pos + 1, commit_graft + pos, |
132 | commit_graft_nr - pos - 1); | |
5040f17e JH |
133 | commit_graft[pos] = graft; |
134 | return 0; | |
135 | } | |
136 | ||
9a934032 | 137 | struct commit_graft *read_graft_line(struct strbuf *line) |
5040f17e JH |
138 | { |
139 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
cfa5bf16 PO |
140 | int i, phase; |
141 | const char *tail = NULL; | |
5040f17e | 142 | struct commit_graft *graft = NULL; |
cfa5bf16 | 143 | struct object_id dummy_oid, *oid; |
5040f17e | 144 | |
9a934032 PO |
145 | strbuf_rtrim(line); |
146 | if (!line->len || line->buf[0] == '#') | |
5bc4ce58 | 147 | return NULL; |
cfa5bf16 PO |
148 | /* |
149 | * phase 0 verifies line, counts hashes in line and allocates graft | |
150 | * phase 1 fills graft | |
151 | */ | |
152 | for (phase = 0; phase < 2; phase++) { | |
153 | oid = graft ? &graft->oid : &dummy_oid; | |
154 | if (parse_oid_hex(line->buf, oid, &tail)) | |
5040f17e | 155 | goto bad_graft_data; |
cfa5bf16 PO |
156 | for (i = 0; *tail != '\0'; i++) { |
157 | oid = graft ? &graft->parent[i] : &dummy_oid; | |
158 | if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail)) | |
159 | goto bad_graft_data; | |
160 | } | |
161 | if (!graft) { | |
162 | graft = xmalloc(st_add(sizeof(*graft), | |
163 | st_mult(sizeof(struct object_id), i))); | |
164 | graft->nr_parent = i; | |
165 | } | |
5040f17e JH |
166 | } |
167 | return graft; | |
df5d43be RT |
168 | |
169 | bad_graft_data: | |
9a934032 | 170 | error("bad graft data: %s", line->buf); |
cfa5bf16 | 171 | assert(!graft); |
df5d43be | 172 | return NULL; |
5040f17e JH |
173 | } |
174 | ||
c5ae6439 | 175 | static int read_graft_file(const char *graft_file) |
5da5c8f4 | 176 | { |
e9d983f1 | 177 | FILE *fp = fopen_or_warn(graft_file, "r"); |
e228c173 | 178 | struct strbuf buf = STRBUF_INIT; |
5040f17e JH |
179 | if (!fp) |
180 | return -1; | |
f9f99b3f JS |
181 | if (advice_graft_file_deprecated) |
182 | advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n" | |
183 | "and will be removed in a future Git version.\n" | |
184 | "\n" | |
185 | "Please use \"git replace --convert-graft-file\"\n" | |
186 | "to convert the grafts into replace refs.\n" | |
187 | "\n" | |
188 | "Turn this message off by running\n" | |
189 | "\"git config advice.graftFileDeprecated false\"")); | |
e228c173 | 190 | while (!strbuf_getwholeline(&buf, fp, '\n')) { |
5da5c8f4 | 191 | /* The format is just "Commit Parent1 Parent2 ...\n" */ |
9a934032 | 192 | struct commit_graft *graft = read_graft_line(&buf); |
5bc4ce58 JH |
193 | if (!graft) |
194 | continue; | |
5040f17e | 195 | if (register_commit_graft(graft, 1)) |
e228c173 | 196 | error("duplicate graft data: %s", buf.buf); |
5da5c8f4 JH |
197 | } |
198 | fclose(fp); | |
e228c173 | 199 | strbuf_release(&buf); |
5040f17e JH |
200 | return 0; |
201 | } | |
202 | ||
203 | static void prepare_commit_graft(void) | |
204 | { | |
205 | static int commit_graft_prepared; | |
206 | char *graft_file; | |
207 | ||
208 | if (commit_graft_prepared) | |
209 | return; | |
210 | graft_file = get_graft_file(); | |
211 | read_graft_file(graft_file); | |
ed09aef0 JS |
212 | /* make sure shallows are read */ |
213 | is_repository_shallow(); | |
5040f17e | 214 | commit_graft_prepared = 1; |
5da5c8f4 JH |
215 | } |
216 | ||
8b65a34c | 217 | struct commit_graft *lookup_commit_graft(const struct object_id *oid) |
5da5c8f4 JH |
218 | { |
219 | int pos; | |
5040f17e | 220 | prepare_commit_graft(); |
8b65a34c | 221 | pos = commit_graft_pos(oid->hash); |
5da5c8f4 JH |
222 | if (pos < 0) |
223 | return NULL; | |
224 | return commit_graft[pos]; | |
225 | } | |
226 | ||
09d46644 | 227 | int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data) |
ed09aef0 | 228 | { |
09d46644 NTND |
229 | int i, ret; |
230 | for (i = ret = 0; i < commit_graft_nr && !ret; i++) | |
231 | ret = fn(commit_graft[i], cb_data); | |
232 | return ret; | |
ed09aef0 JS |
233 | } |
234 | ||
e92b848c | 235 | int unregister_shallow(const struct object_id *oid) |
f53514bc | 236 | { |
e92b848c | 237 | int pos = commit_graft_pos(oid->hash); |
f53514bc JS |
238 | if (pos < 0) |
239 | return -1; | |
240 | if (pos + 1 < commit_graft_nr) | |
f331ab9d RS |
241 | MOVE_ARRAY(commit_graft + pos, commit_graft + pos + 1, |
242 | commit_graft_nr - pos - 1); | |
f53514bc JS |
243 | commit_graft_nr--; |
244 | return 0; | |
245 | } | |
246 | ||
8597ea3a JK |
247 | struct commit_buffer { |
248 | void *buffer; | |
249 | unsigned long size; | |
250 | }; | |
251 | define_commit_slab(buffer_slab, struct commit_buffer); | |
c1b3c71f JK |
252 | static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab); |
253 | ||
8597ea3a | 254 | void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size) |
66c2827e | 255 | { |
8597ea3a JK |
256 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
257 | v->buffer = buffer; | |
258 | v->size = size; | |
66c2827e JK |
259 | } |
260 | ||
8597ea3a | 261 | const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep) |
152ff1cc | 262 | { |
862e730e JH |
263 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
264 | if (!v) { | |
265 | if (sizep) | |
266 | *sizep = 0; | |
267 | return NULL; | |
268 | } | |
8597ea3a JK |
269 | if (sizep) |
270 | *sizep = v->size; | |
271 | return v->buffer; | |
152ff1cc JK |
272 | } |
273 | ||
8597ea3a | 274 | const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep) |
152ff1cc | 275 | { |
8597ea3a | 276 | const void *ret = get_cached_commit_buffer(commit, sizep); |
152ff1cc JK |
277 | if (!ret) { |
278 | enum object_type type; | |
279 | unsigned long size; | |
b4f5aca4 | 280 | ret = read_object_file(&commit->object.oid, &type, &size); |
152ff1cc JK |
281 | if (!ret) |
282 | die("cannot read commit object %s", | |
f2fd0760 | 283 | oid_to_hex(&commit->object.oid)); |
152ff1cc JK |
284 | if (type != OBJ_COMMIT) |
285 | die("expected commit for %s, got %s", | |
debca9d2 | 286 | oid_to_hex(&commit->object.oid), type_name(type)); |
8597ea3a JK |
287 | if (sizep) |
288 | *sizep = size; | |
152ff1cc JK |
289 | } |
290 | return ret; | |
291 | } | |
292 | ||
293 | void unuse_commit_buffer(const struct commit *commit, const void *buffer) | |
294 | { | |
862e730e JH |
295 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
296 | if (!(v && v->buffer == buffer)) | |
152ff1cc JK |
297 | free((void *)buffer); |
298 | } | |
299 | ||
0fb370da JK |
300 | void free_commit_buffer(struct commit *commit) |
301 | { | |
862e730e JH |
302 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
303 | if (v) { | |
6a83d902 | 304 | FREE_AND_NULL(v->buffer); |
862e730e JH |
305 | v->size = 0; |
306 | } | |
0fb370da JK |
307 | } |
308 | ||
5bb03de1 DS |
309 | struct tree *get_commit_tree(const struct commit *commit) |
310 | { | |
7b8a21db DS |
311 | if (commit->maybe_tree || !commit->object.parsed) |
312 | return commit->maybe_tree; | |
313 | ||
314 | if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH) | |
315 | BUG("commit has NULL tree, but was not loaded from commit-graph"); | |
316 | ||
317 | return get_commit_tree_in_graph(commit); | |
5bb03de1 DS |
318 | } |
319 | ||
320 | struct object_id *get_commit_tree_oid(const struct commit *commit) | |
321 | { | |
322 | return &get_commit_tree(commit)->object.oid; | |
323 | } | |
324 | ||
8597ea3a | 325 | const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep) |
0fb370da | 326 | { |
862e730e | 327 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
8597ea3a JK |
328 | void *ret; |
329 | ||
862e730e JH |
330 | if (!v) { |
331 | if (sizep) | |
332 | *sizep = 0; | |
333 | return NULL; | |
334 | } | |
8597ea3a JK |
335 | ret = v->buffer; |
336 | if (sizep) | |
337 | *sizep = v->size; | |
338 | ||
339 | v->buffer = NULL; | |
340 | v->size = 0; | |
0fb370da JK |
341 | return ret; |
342 | } | |
343 | ||
cf7b1cad | 344 | int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size) |
175785e5 | 345 | { |
cf7b1cad NTND |
346 | const char *tail = buffer; |
347 | const char *bufptr = buffer; | |
7683e2e6 | 348 | struct object_id parent; |
6c88be16 | 349 | struct commit_list **pptr; |
5da5c8f4 | 350 | struct commit_graft *graft; |
7683e2e6 | 351 | const int tree_entry_len = GIT_SHA1_HEXSZ + 5; |
352 | const int parent_entry_len = GIT_SHA1_HEXSZ + 7; | |
bd2c39f5 | 353 | |
175785e5 DB |
354 | if (item->object.parsed) |
355 | return 0; | |
356 | item->object.parsed = 1; | |
3b44f15a | 357 | tail += size; |
7683e2e6 | 358 | if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || |
359 | bufptr[tree_entry_len] != '\n') | |
f2fd0760 | 360 | return error("bogus commit object %s", oid_to_hex(&item->object.oid)); |
7683e2e6 | 361 | if (get_sha1_hex(bufptr + 5, parent.hash) < 0) |
bd2afde8 | 362 | return error("bad tree pointer in commit %s", |
f2fd0760 | 363 | oid_to_hex(&item->object.oid)); |
891435d5 | 364 | item->maybe_tree = lookup_tree(&parent); |
7683e2e6 | 365 | bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ |
6c88be16 | 366 | pptr = &item->parents; |
5da5c8f4 | 367 | |
8b65a34c | 368 | graft = lookup_commit_graft(&item->object.oid); |
7683e2e6 | 369 | while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { |
f7cc77d7 LT |
370 | struct commit *new_parent; |
371 | ||
7683e2e6 | 372 | if (tail <= bufptr + parent_entry_len + 1 || |
373 | get_sha1_hex(bufptr + 7, parent.hash) || | |
374 | bufptr[parent_entry_len] != '\n') | |
f2fd0760 | 375 | return error("bad parents in commit %s", oid_to_hex(&item->object.oid)); |
7683e2e6 | 376 | bufptr += parent_entry_len + 1; |
7f3140cd JS |
377 | /* |
378 | * The clone is shallow if nr_parent < 0, and we must | |
379 | * not traverse its real parents even when we unhide them. | |
380 | */ | |
381 | if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) | |
5da5c8f4 | 382 | continue; |
bc83266a | 383 | new_parent = lookup_commit(&parent); |
39468def | 384 | if (new_parent) |
6c88be16 | 385 | pptr = &commit_list_insert(new_parent, pptr)->next; |
5da5c8f4 JH |
386 | } |
387 | if (graft) { | |
388 | int i; | |
389 | struct commit *new_parent; | |
390 | for (i = 0; i < graft->nr_parent; i++) { | |
bc83266a | 391 | new_parent = lookup_commit(&graft->parent[i]); |
5da5c8f4 JH |
392 | if (!new_parent) |
393 | continue; | |
394 | pptr = &commit_list_insert(new_parent, pptr)->next; | |
5da5c8f4 | 395 | } |
175785e5 | 396 | } |
0a617799 | 397 | item->date = parse_commit_date(bufptr, tail); |
27dedf0c | 398 | |
175785e5 DB |
399 | return 0; |
400 | } | |
401 | ||
9cc2b07a | 402 | int parse_commit_gently(struct commit *item, int quiet_on_missing) |
bd2c39f5 | 403 | { |
21666f1a | 404 | enum object_type type; |
bd2c39f5 NP |
405 | void *buffer; |
406 | unsigned long size; | |
407 | int ret; | |
408 | ||
9786f68b MK |
409 | if (!item) |
410 | return -1; | |
bd2c39f5 NP |
411 | if (item->object.parsed) |
412 | return 0; | |
177722b3 DS |
413 | if (parse_commit_in_graph(item)) |
414 | return 0; | |
b4f5aca4 | 415 | buffer = read_object_file(&item->object.oid, &type, &size); |
bd2c39f5 | 416 | if (!buffer) |
9cc2b07a JK |
417 | return quiet_on_missing ? -1 : |
418 | error("Could not read %s", | |
f2fd0760 | 419 | oid_to_hex(&item->object.oid)); |
21666f1a | 420 | if (type != OBJ_COMMIT) { |
bd2c39f5 NP |
421 | free(buffer); |
422 | return error("Object %s not a commit", | |
f2fd0760 | 423 | oid_to_hex(&item->object.oid)); |
bd2c39f5 NP |
424 | } |
425 | ret = parse_commit_buffer(item, buffer, size); | |
60ab26de | 426 | if (save_commit_buffer && !ret) { |
8597ea3a | 427 | set_commit_buffer(item, buffer, size); |
3ff1fbbb LT |
428 | return 0; |
429 | } | |
bd2c39f5 NP |
430 | free(buffer); |
431 | return ret; | |
432 | } | |
433 | ||
7059dccc JK |
434 | void parse_commit_or_die(struct commit *item) |
435 | { | |
436 | if (parse_commit(item)) | |
437 | die("unable to parse commit %s", | |
f2fd0760 | 438 | item ? oid_to_hex(&item->object.oid) : "(null)"); |
7059dccc JK |
439 | } |
440 | ||
11af2aae CC |
441 | int find_commit_subject(const char *commit_buffer, const char **subject) |
442 | { | |
443 | const char *eol; | |
444 | const char *p = commit_buffer; | |
445 | ||
446 | while (*p && (*p != '\n' || p[1] != '\n')) | |
447 | p++; | |
448 | if (*p) { | |
4e1b06da | 449 | p = skip_blank_lines(p + 2); |
9c9b03b1 | 450 | eol = strchrnul(p, '\n'); |
11af2aae CC |
451 | } else |
452 | eol = p; | |
453 | ||
454 | *subject = p; | |
455 | ||
456 | return eol - p; | |
457 | } | |
458 | ||
ac5155ef | 459 | struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) |
dd97f850 | 460 | { |
812666c8 | 461 | struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); |
dd97f850 DB |
462 | new_list->item = item; |
463 | new_list->next = *list_p; | |
464 | *list_p = new_list; | |
ac5155ef | 465 | return new_list; |
dd97f850 DB |
466 | } |
467 | ||
65319475 MV |
468 | unsigned commit_list_count(const struct commit_list *l) |
469 | { | |
470 | unsigned c = 0; | |
471 | for (; l; l = l->next ) | |
472 | c++; | |
473 | return c; | |
474 | } | |
475 | ||
53d00b39 TR |
476 | struct commit_list *copy_commit_list(struct commit_list *list) |
477 | { | |
478 | struct commit_list *head = NULL; | |
479 | struct commit_list **pp = &head; | |
480 | while (list) { | |
cb979dbd | 481 | pp = commit_list_append(list->item, pp); |
53d00b39 TR |
482 | list = list->next; |
483 | } | |
484 | return head; | |
485 | } | |
486 | ||
175785e5 DB |
487 | void free_commit_list(struct commit_list *list) |
488 | { | |
e510ab89 RS |
489 | while (list) |
490 | pop_commit(&list); | |
175785e5 | 491 | } |
dd97f850 | 492 | |
47e44ed1 | 493 | struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list) |
dd97f850 DB |
494 | { |
495 | struct commit_list **pp = list; | |
496 | struct commit_list *p; | |
497 | while ((p = *pp) != NULL) { | |
498 | if (p->item->date < item->date) { | |
499 | break; | |
500 | } | |
501 | pp = &p->next; | |
502 | } | |
f755494c | 503 | return commit_list_insert(item, pp); |
dd97f850 DB |
504 | } |
505 | ||
46905893 RS |
506 | static int commit_list_compare_by_date(const void *a, const void *b) |
507 | { | |
dddbad72 JS |
508 | timestamp_t a_date = ((const struct commit_list *)a)->item->date; |
509 | timestamp_t b_date = ((const struct commit_list *)b)->item->date; | |
46905893 RS |
510 | if (a_date < b_date) |
511 | return 1; | |
512 | if (a_date > b_date) | |
513 | return -1; | |
514 | return 0; | |
515 | } | |
516 | ||
517 | static void *commit_list_get_next(const void *a) | |
518 | { | |
519 | return ((const struct commit_list *)a)->next; | |
520 | } | |
521 | ||
522 | static void commit_list_set_next(void *a, void *next) | |
523 | { | |
524 | ((struct commit_list *)a)->next = next; | |
525 | } | |
a6080a0a | 526 | |
47e44ed1 | 527 | void commit_list_sort_by_date(struct commit_list **list) |
dd97f850 | 528 | { |
7365c95d JH |
529 | *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next, |
530 | commit_list_compare_by_date); | |
dd97f850 DB |
531 | } |
532 | ||
58e28af6 DB |
533 | struct commit *pop_most_recent_commit(struct commit_list **list, |
534 | unsigned int mark) | |
dd97f850 | 535 | { |
e510ab89 | 536 | struct commit *ret = pop_commit(list); |
dd97f850 | 537 | struct commit_list *parents = ret->parents; |
dd97f850 DB |
538 | |
539 | while (parents) { | |
4056c091 | 540 | struct commit *commit = parents->item; |
dec38c81 | 541 | if (!parse_commit(commit) && !(commit->object.flags & mark)) { |
58e28af6 | 542 | commit->object.flags |= mark; |
47e44ed1 | 543 | commit_list_insert_by_date(commit, list); |
4056c091 | 544 | } |
dd97f850 DB |
545 | parents = parents->next; |
546 | } | |
547 | return ret; | |
548 | } | |
e3bc7a3b | 549 | |
941ba8db NTND |
550 | static void clear_commit_marks_1(struct commit_list **plist, |
551 | struct commit *commit, unsigned int mark) | |
f8f9c73c | 552 | { |
60fcc2e6 JS |
553 | while (commit) { |
554 | struct commit_list *parents; | |
f8f9c73c | 555 | |
60fcc2e6 JS |
556 | if (!(mark & commit->object.flags)) |
557 | return; | |
58ecf5c1 | 558 | |
60fcc2e6 JS |
559 | commit->object.flags &= ~mark; |
560 | ||
561 | parents = commit->parents; | |
562 | if (!parents) | |
563 | return; | |
564 | ||
565 | while ((parents = parents->next)) | |
941ba8db | 566 | commit_list_insert(parents->item, plist); |
60fcc2e6 JS |
567 | |
568 | commit = commit->parents->item; | |
f8f9c73c JH |
569 | } |
570 | } | |
571 | ||
e895cb51 | 572 | void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark) |
941ba8db NTND |
573 | { |
574 | struct commit_list *list = NULL; | |
e895cb51 JH |
575 | |
576 | while (nr--) { | |
07f7d55a | 577 | clear_commit_marks_1(&list, *commit, mark); |
e895cb51 JH |
578 | commit++; |
579 | } | |
941ba8db NTND |
580 | while (list) |
581 | clear_commit_marks_1(&list, pop_commit(&list), mark); | |
582 | } | |
583 | ||
e895cb51 JH |
584 | void clear_commit_marks(struct commit *commit, unsigned int mark) |
585 | { | |
586 | clear_commit_marks_many(1, &commit, mark); | |
587 | } | |
588 | ||
a3437b8c JS |
589 | struct commit *pop_commit(struct commit_list **stack) |
590 | { | |
591 | struct commit_list *top = *stack; | |
592 | struct commit *item = top ? top->item : NULL; | |
593 | ||
594 | if (top) { | |
595 | *stack = top->next; | |
596 | free(top); | |
597 | } | |
598 | return item; | |
599 | } | |
600 | ||
a84b794a JH |
601 | /* |
602 | * Topological sort support | |
603 | */ | |
96c4f4a3 | 604 | |
a84b794a JH |
605 | /* count number of children that have not been emitted */ |
606 | define_commit_slab(indegree_slab, int); | |
96c4f4a3 | 607 | |
81c6b38b JH |
608 | /* record author-date for each commit object */ |
609 | define_commit_slab(author_date_slab, unsigned long); | |
610 | ||
611 | static void record_author_date(struct author_date_slab *author_date, | |
612 | struct commit *commit) | |
613 | { | |
8597ea3a | 614 | const char *buffer = get_commit_buffer(commit, NULL); |
81c6b38b | 615 | struct ident_split ident; |
ea5517f0 JK |
616 | const char *ident_line; |
617 | size_t ident_len; | |
81c6b38b | 618 | char *date_end; |
dddbad72 | 619 | timestamp_t date; |
81c6b38b | 620 | |
ea5517f0 JK |
621 | ident_line = find_commit_header(buffer, "author", &ident_len); |
622 | if (!ident_line) | |
623 | goto fail_exit; /* no author line */ | |
624 | if (split_ident_line(&ident, ident_line, ident_len) || | |
625 | !ident.date_begin || !ident.date_end) | |
626 | goto fail_exit; /* malformed "author" line */ | |
81c6b38b | 627 | |
1aeb7e75 | 628 | date = parse_timestamp(ident.date_begin, &date_end, 10); |
81c6b38b JH |
629 | if (date_end != ident.date_end) |
630 | goto fail_exit; /* malformed date */ | |
631 | *(author_date_slab_at(author_date, commit)) = date; | |
632 | ||
633 | fail_exit: | |
ba41c1c9 | 634 | unuse_commit_buffer(commit, buffer); |
81c6b38b JH |
635 | } |
636 | ||
637 | static int compare_commits_by_author_date(const void *a_, const void *b_, | |
638 | void *cb_data) | |
639 | { | |
640 | const struct commit *a = a_, *b = b_; | |
641 | struct author_date_slab *author_date = cb_data; | |
dddbad72 JS |
642 | timestamp_t a_date = *(author_date_slab_at(author_date, a)); |
643 | timestamp_t b_date = *(author_date_slab_at(author_date, b)); | |
81c6b38b JH |
644 | |
645 | /* newer commits with larger date first */ | |
646 | if (a_date < b_date) | |
647 | return 1; | |
648 | else if (a_date > b_date) | |
649 | return -1; | |
650 | return 0; | |
651 | } | |
652 | ||
727377ff | 653 | int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused) |
da24b104 JH |
654 | { |
655 | const struct commit *a = a_, *b = b_; | |
656 | /* newer commits with larger date first */ | |
657 | if (a->date < b->date) | |
658 | return 1; | |
659 | else if (a->date > b->date) | |
660 | return -1; | |
661 | return 0; | |
662 | } | |
663 | ||
ab580ace JS |
664 | /* |
665 | * Performs an in-place topological sort on the list supplied. | |
666 | */ | |
da24b104 | 667 | void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order) |
6b6dcfc2 | 668 | { |
23c17d4a | 669 | struct commit_list *next, *orig = *list; |
23c17d4a | 670 | struct commit_list **pptr; |
a84b794a | 671 | struct indegree_slab indegree; |
da24b104 JH |
672 | struct prio_queue queue; |
673 | struct commit *commit; | |
81c6b38b | 674 | struct author_date_slab author_date; |
a6080a0a | 675 | |
23c17d4a | 676 | if (!orig) |
7d6fb370 | 677 | return; |
23c17d4a LT |
678 | *list = NULL; |
679 | ||
a84b794a | 680 | init_indegree_slab(&indegree); |
da24b104 | 681 | memset(&queue, '\0', sizeof(queue)); |
81c6b38b | 682 | |
da24b104 JH |
683 | switch (sort_order) { |
684 | default: /* REV_SORT_IN_GRAPH_ORDER */ | |
685 | queue.compare = NULL; | |
686 | break; | |
687 | case REV_SORT_BY_COMMIT_DATE: | |
688 | queue.compare = compare_commits_by_commit_date; | |
689 | break; | |
81c6b38b JH |
690 | case REV_SORT_BY_AUTHOR_DATE: |
691 | init_author_date_slab(&author_date); | |
692 | queue.compare = compare_commits_by_author_date; | |
693 | queue.cb_data = &author_date; | |
694 | break; | |
da24b104 | 695 | } |
96c4f4a3 | 696 | |
23c17d4a LT |
697 | /* Mark them and clear the indegree */ |
698 | for (next = orig; next; next = next->next) { | |
699 | struct commit *commit = next->item; | |
a84b794a | 700 | *(indegree_slab_at(&indegree, commit)) = 1; |
81c6b38b JH |
701 | /* also record the author dates, if needed */ |
702 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) | |
703 | record_author_date(&author_date, commit); | |
ab580ace | 704 | } |
23c17d4a | 705 | |
ab580ace | 706 | /* update the indegree */ |
23c17d4a | 707 | for (next = orig; next; next = next->next) { |
da24b104 | 708 | struct commit_list *parents = next->item->parents; |
ab580ace | 709 | while (parents) { |
23c17d4a | 710 | struct commit *parent = parents->item; |
a84b794a | 711 | int *pi = indegree_slab_at(&indegree, parent); |
6b6dcfc2 | 712 | |
96c4f4a3 JK |
713 | if (*pi) |
714 | (*pi)++; | |
23c17d4a | 715 | parents = parents->next; |
ab580ace | 716 | } |
ab580ace | 717 | } |
23c17d4a | 718 | |
a6080a0a | 719 | /* |
674d1727 PH |
720 | * find the tips |
721 | * | |
722 | * tips are nodes not reachable from any other node in the list | |
723 | * | |
724 | * the tips serve as a starting set for the work queue. | |
725 | */ | |
23c17d4a LT |
726 | for (next = orig; next; next = next->next) { |
727 | struct commit *commit = next->item; | |
ab580ace | 728 | |
a84b794a | 729 | if (*(indegree_slab_at(&indegree, commit)) == 1) |
da24b104 | 730 | prio_queue_put(&queue, commit); |
ab580ace | 731 | } |
4c8725f1 | 732 | |
da24b104 JH |
733 | /* |
734 | * This is unfortunate; the initial tips need to be shown | |
735 | * in the order given from the revision traversal machinery. | |
736 | */ | |
737 | if (sort_order == REV_SORT_IN_GRAPH_ORDER) | |
738 | prio_queue_reverse(&queue); | |
739 | ||
740 | /* We no longer need the commit list */ | |
741 | free_commit_list(orig); | |
23c17d4a LT |
742 | |
743 | pptr = list; | |
744 | *list = NULL; | |
da24b104 JH |
745 | while ((commit = prio_queue_get(&queue)) != NULL) { |
746 | struct commit_list *parents; | |
23c17d4a | 747 | |
23c17d4a | 748 | for (parents = commit->parents; parents ; parents = parents->next) { |
cd2b8ae9 | 749 | struct commit *parent = parents->item; |
a84b794a | 750 | int *pi = indegree_slab_at(&indegree, parent); |
23c17d4a | 751 | |
96c4f4a3 | 752 | if (!*pi) |
23c17d4a LT |
753 | continue; |
754 | ||
755 | /* | |
756 | * parents are only enqueued for emission | |
757 | * when all their children have been emitted thereby | |
758 | * guaranteeing topological order. | |
759 | */ | |
da24b104 JH |
760 | if (--(*pi) == 1) |
761 | prio_queue_put(&queue, parent); | |
ab580ace JS |
762 | } |
763 | /* | |
da24b104 JH |
764 | * all children of commit have already been |
765 | * emitted. we can emit it now. | |
674d1727 | 766 | */ |
a84b794a | 767 | *(indegree_slab_at(&indegree, commit)) = 0; |
da24b104 JH |
768 | |
769 | pptr = &commit_list_insert(commit, pptr)->next; | |
ab580ace | 770 | } |
96c4f4a3 | 771 | |
a84b794a | 772 | clear_indegree_slab(&indegree); |
da24b104 | 773 | clear_prio_queue(&queue); |
81c6b38b JH |
774 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) |
775 | clear_author_date_slab(&author_date); | |
ab580ace | 776 | } |
7c6f8aaf | 777 | |
1295228d | 778 | /* merge-base stuff */ |
7c6f8aaf | 779 | |
208acbfb | 780 | /* Remember to update object flag allocation in object.h */ |
577ed5c2 JH |
781 | #define PARENT1 (1u<<16) |
782 | #define PARENT2 (1u<<17) | |
783 | #define STALE (1u<<18) | |
784 | #define RESULT (1u<<19) | |
7c6f8aaf | 785 | |
1295228d JH |
786 | static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT); |
787 | ||
73f43f22 | 788 | static int queue_has_nonstale(struct prio_queue *queue) |
7c6f8aaf | 789 | { |
73f43f22 JK |
790 | int i; |
791 | for (i = 0; i < queue->nr; i++) { | |
792 | struct commit *commit = queue->array[i].data; | |
793 | if (!(commit->object.flags & STALE)) | |
794 | return 1; | |
7c6f8aaf | 795 | } |
73f43f22 | 796 | return 0; |
7c6f8aaf JS |
797 | } |
798 | ||
d866924a | 799 | /* all input commits in one and twos[] must have been parsed! */ |
da1f5156 | 800 | static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos) |
7c6f8aaf | 801 | { |
73f43f22 | 802 | struct prio_queue queue = { compare_commits_by_commit_date }; |
7c6f8aaf | 803 | struct commit_list *result = NULL; |
6a938648 | 804 | int i; |
7c6f8aaf | 805 | |
f3249438 | 806 | one->object.flags |= PARENT1; |
73f43f22 JK |
807 | if (!n) { |
808 | commit_list_append(one, &result); | |
809 | return result; | |
810 | } | |
811 | prio_queue_put(&queue, one); | |
812 | ||
6a938648 JH |
813 | for (i = 0; i < n; i++) { |
814 | twos[i]->object.flags |= PARENT2; | |
73f43f22 | 815 | prio_queue_put(&queue, twos[i]); |
6a938648 | 816 | } |
7c6f8aaf | 817 | |
73f43f22 JK |
818 | while (queue_has_nonstale(&queue)) { |
819 | struct commit *commit = prio_queue_get(&queue); | |
7c6f8aaf | 820 | struct commit_list *parents; |
f3249438 | 821 | int flags; |
7c6f8aaf | 822 | |
f3249438 JH |
823 | flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); |
824 | if (flags == (PARENT1 | PARENT2)) { | |
825 | if (!(commit->object.flags & RESULT)) { | |
826 | commit->object.flags |= RESULT; | |
47e44ed1 | 827 | commit_list_insert_by_date(commit, &result); |
f3249438 | 828 | } |
542ccefe JH |
829 | /* Mark parents of a found merge stale */ |
830 | flags |= STALE; | |
7c6f8aaf JS |
831 | } |
832 | parents = commit->parents; | |
833 | while (parents) { | |
834 | struct commit *p = parents->item; | |
835 | parents = parents->next; | |
836 | if ((p->object.flags & flags) == flags) | |
837 | continue; | |
172947e6 MK |
838 | if (parse_commit(p)) |
839 | return NULL; | |
7c6f8aaf | 840 | p->object.flags |= flags; |
73f43f22 | 841 | prio_queue_put(&queue, p); |
7c6f8aaf JS |
842 | } |
843 | } | |
844 | ||
73f43f22 | 845 | clear_prio_queue(&queue); |
da1f5156 JH |
846 | return result; |
847 | } | |
848 | ||
849 | static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos) | |
850 | { | |
851 | struct commit_list *list = NULL; | |
852 | struct commit_list *result = NULL; | |
853 | int i; | |
854 | ||
855 | for (i = 0; i < n; i++) { | |
856 | if (one == twos[i]) | |
857 | /* | |
858 | * We do not mark this even with RESULT so we do not | |
859 | * have to clean it up. | |
860 | */ | |
861 | return commit_list_insert(one, &result); | |
862 | } | |
863 | ||
864 | if (parse_commit(one)) | |
865 | return NULL; | |
866 | for (i = 0; i < n; i++) { | |
867 | if (parse_commit(twos[i])) | |
868 | return NULL; | |
869 | } | |
870 | ||
871 | list = paint_down_to_common(one, n, twos); | |
872 | ||
f3249438 | 873 | while (list) { |
e510ab89 RS |
874 | struct commit *commit = pop_commit(&list); |
875 | if (!(commit->object.flags & STALE)) | |
876 | commit_list_insert_by_date(commit, &result); | |
f3249438 JH |
877 | } |
878 | return result; | |
879 | } | |
7c6f8aaf | 880 | |
5240c9d7 MV |
881 | struct commit_list *get_octopus_merge_bases(struct commit_list *in) |
882 | { | |
883 | struct commit_list *i, *j, *k, *ret = NULL; | |
5240c9d7 | 884 | |
6bc76725 VM |
885 | if (!in) |
886 | return ret; | |
887 | ||
888 | commit_list_insert(in->item, &ret); | |
889 | ||
890 | for (i = in->next; i; i = i->next) { | |
258c03eb | 891 | struct commit_list *new_commits = NULL, *end = NULL; |
6bc76725 VM |
892 | |
893 | for (j = ret; j; j = j->next) { | |
894 | struct commit_list *bases; | |
2ce406cc | 895 | bases = get_merge_bases(i->item, j->item); |
258c03eb BW |
896 | if (!new_commits) |
897 | new_commits = bases; | |
6bc76725 VM |
898 | else |
899 | end->next = bases; | |
900 | for (k = bases; k; k = k->next) | |
901 | end = k; | |
5240c9d7 | 902 | } |
258c03eb | 903 | ret = new_commits; |
5240c9d7 MV |
904 | } |
905 | return ret; | |
906 | } | |
907 | ||
94f0ced0 JH |
908 | static int remove_redundant(struct commit **array, int cnt) |
909 | { | |
910 | /* | |
911 | * Some commit in the array may be an ancestor of | |
912 | * another commit. Move such commit to the end of | |
913 | * the array, and return the number of commits that | |
914 | * are independent from each other. | |
915 | */ | |
916 | struct commit **work; | |
917 | unsigned char *redundant; | |
918 | int *filled_index; | |
919 | int i, j, filled; | |
920 | ||
921 | work = xcalloc(cnt, sizeof(*work)); | |
922 | redundant = xcalloc(cnt, 1); | |
b32fa95f | 923 | ALLOC_ARRAY(filled_index, cnt - 1); |
94f0ced0 | 924 | |
d866924a JH |
925 | for (i = 0; i < cnt; i++) |
926 | parse_commit(array[i]); | |
94f0ced0 JH |
927 | for (i = 0; i < cnt; i++) { |
928 | struct commit_list *common; | |
929 | ||
930 | if (redundant[i]) | |
931 | continue; | |
932 | for (j = filled = 0; j < cnt; j++) { | |
933 | if (i == j || redundant[j]) | |
934 | continue; | |
935 | filled_index[filled] = j; | |
936 | work[filled++] = array[j]; | |
937 | } | |
938 | common = paint_down_to_common(array[i], filled, work); | |
939 | if (array[i]->object.flags & PARENT2) | |
940 | redundant[i] = 1; | |
941 | for (j = 0; j < filled; j++) | |
942 | if (work[j]->object.flags & PARENT1) | |
943 | redundant[filled_index[j]] = 1; | |
944 | clear_commit_marks(array[i], all_flags); | |
abc03512 | 945 | clear_commit_marks_many(filled, work, all_flags); |
94f0ced0 JH |
946 | free_commit_list(common); |
947 | } | |
948 | ||
949 | /* Now collect the result */ | |
45ccef87 | 950 | COPY_ARRAY(work, array, cnt); |
94f0ced0 JH |
951 | for (i = filled = 0; i < cnt; i++) |
952 | if (!redundant[i]) | |
953 | array[filled++] = work[i]; | |
954 | for (j = filled, i = 0; i < cnt; i++) | |
955 | if (redundant[i]) | |
956 | array[j++] = work[i]; | |
957 | free(work); | |
958 | free(redundant); | |
959 | free(filled_index); | |
960 | return filled; | |
961 | } | |
962 | ||
2ce406cc JH |
963 | static struct commit_list *get_merge_bases_many_0(struct commit *one, |
964 | int n, | |
965 | struct commit **twos, | |
966 | int cleanup) | |
f3249438 | 967 | { |
f3249438 JH |
968 | struct commit_list *list; |
969 | struct commit **rslt; | |
970 | struct commit_list *result; | |
94f0ced0 | 971 | int cnt, i; |
f3249438 | 972 | |
6a938648 JH |
973 | result = merge_bases_many(one, n, twos); |
974 | for (i = 0; i < n; i++) { | |
975 | if (one == twos[i]) | |
976 | return result; | |
977 | } | |
f3249438 JH |
978 | if (!result || !result->next) { |
979 | if (cleanup) { | |
980 | clear_commit_marks(one, all_flags); | |
e895cb51 | 981 | clear_commit_marks_many(n, twos, all_flags); |
7c6f8aaf | 982 | } |
f3249438 | 983 | return result; |
7c6f8aaf JS |
984 | } |
985 | ||
f3249438 | 986 | /* There are more than one */ |
4bbaa1eb | 987 | cnt = commit_list_count(result); |
f3249438 JH |
988 | rslt = xcalloc(cnt, sizeof(*rslt)); |
989 | for (list = result, i = 0; list; list = list->next) | |
990 | rslt[i++] = list->item; | |
991 | free_commit_list(result); | |
992 | ||
993 | clear_commit_marks(one, all_flags); | |
e895cb51 | 994 | clear_commit_marks_many(n, twos, all_flags); |
7c6f8aaf | 995 | |
94f0ced0 | 996 | cnt = remove_redundant(rslt, cnt); |
f3249438 | 997 | result = NULL; |
94f0ced0 JH |
998 | for (i = 0; i < cnt; i++) |
999 | commit_list_insert_by_date(rslt[i], &result); | |
f3249438 | 1000 | free(rslt); |
7c6f8aaf JS |
1001 | return result; |
1002 | } | |
2ecd2bbc | 1003 | |
2ce406cc JH |
1004 | struct commit_list *get_merge_bases_many(struct commit *one, |
1005 | int n, | |
1006 | struct commit **twos) | |
1007 | { | |
1008 | return get_merge_bases_many_0(one, n, twos, 1); | |
1009 | } | |
1010 | ||
1011 | struct commit_list *get_merge_bases_many_dirty(struct commit *one, | |
1012 | int n, | |
1013 | struct commit **twos) | |
1014 | { | |
1015 | return get_merge_bases_many_0(one, n, twos, 0); | |
1016 | } | |
1017 | ||
1018 | struct commit_list *get_merge_bases(struct commit *one, struct commit *two) | |
6a938648 | 1019 | { |
2ce406cc | 1020 | return get_merge_bases_many_0(one, 1, &two, 1); |
6a938648 JH |
1021 | } |
1022 | ||
a20efee9 | 1023 | /* |
41ccfdd9 | 1024 | * Is "commit" a descendant of one of the elements on the "with_commit" list? |
a20efee9 | 1025 | */ |
7fcdb36e JG |
1026 | int is_descendant_of(struct commit *commit, struct commit_list *with_commit) |
1027 | { | |
1028 | if (!with_commit) | |
1029 | return 1; | |
1030 | while (with_commit) { | |
1031 | struct commit *other; | |
1032 | ||
1033 | other = with_commit->item; | |
1034 | with_commit = with_commit->next; | |
a20efee9 | 1035 | if (in_merge_bases(other, commit)) |
7fcdb36e JG |
1036 | return 1; |
1037 | } | |
1038 | return 0; | |
1039 | } | |
1040 | ||
a20efee9 | 1041 | /* |
4c4b27e8 | 1042 | * Is "commit" an ancestor of one of the "references"? |
a20efee9 | 1043 | */ |
4c4b27e8 | 1044 | int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference) |
2ecd2bbc | 1045 | { |
6440fdba | 1046 | struct commit_list *bases; |
4c4b27e8 | 1047 | int ret = 0, i; |
2ecd2bbc | 1048 | |
4c4b27e8 | 1049 | if (parse_commit(commit)) |
6440fdba | 1050 | return ret; |
4c4b27e8 JH |
1051 | for (i = 0; i < nr_reference; i++) |
1052 | if (parse_commit(reference[i])) | |
1053 | return ret; | |
2ecd2bbc | 1054 | |
4c4b27e8 | 1055 | bases = paint_down_to_common(commit, nr_reference, reference); |
6440fdba JH |
1056 | if (commit->object.flags & PARENT2) |
1057 | ret = 1; | |
b0f9e9ee | 1058 | clear_commit_marks(commit, all_flags); |
557899ff | 1059 | clear_commit_marks_many(nr_reference, reference, all_flags); |
2ecd2bbc JH |
1060 | free_commit_list(bases); |
1061 | return ret; | |
1062 | } | |
98cf9c3b | 1063 | |
4c4b27e8 JH |
1064 | /* |
1065 | * Is "commit" an ancestor of (i.e. reachable from) the "reference"? | |
1066 | */ | |
1067 | int in_merge_bases(struct commit *commit, struct commit *reference) | |
1068 | { | |
1069 | return in_merge_bases_many(commit, 1, &reference); | |
1070 | } | |
1071 | ||
98cf9c3b JH |
1072 | struct commit_list *reduce_heads(struct commit_list *heads) |
1073 | { | |
1074 | struct commit_list *p; | |
1075 | struct commit_list *result = NULL, **tail = &result; | |
f37d3c75 JH |
1076 | struct commit **array; |
1077 | int num_head, i; | |
98cf9c3b JH |
1078 | |
1079 | if (!heads) | |
1080 | return NULL; | |
1081 | ||
f37d3c75 JH |
1082 | /* Uniquify */ |
1083 | for (p = heads; p; p = p->next) | |
1084 | p->item->object.flags &= ~STALE; | |
1085 | for (p = heads, num_head = 0; p; p = p->next) { | |
1086 | if (p->item->object.flags & STALE) | |
711f6b29 | 1087 | continue; |
f37d3c75 JH |
1088 | p->item->object.flags |= STALE; |
1089 | num_head++; | |
1090 | } | |
c4a7b009 | 1091 | array = xcalloc(num_head, sizeof(*array)); |
f37d3c75 JH |
1092 | for (p = heads, i = 0; p; p = p->next) { |
1093 | if (p->item->object.flags & STALE) { | |
1094 | array[i++] = p->item; | |
1095 | p->item->object.flags &= ~STALE; | |
98cf9c3b | 1096 | } |
98cf9c3b | 1097 | } |
f37d3c75 JH |
1098 | num_head = remove_redundant(array, num_head); |
1099 | for (i = 0; i < num_head; i++) | |
1100 | tail = &commit_list_insert(array[i], tail)->next; | |
cb7b29eb | 1101 | free(array); |
98cf9c3b JH |
1102 | return result; |
1103 | } | |
40d52ff7 | 1104 | |
4da72644 MÅ |
1105 | void reduce_heads_replace(struct commit_list **heads) |
1106 | { | |
1107 | struct commit_list *result = reduce_heads(*heads); | |
1108 | free_commit_list(*heads); | |
1109 | *heads = result; | |
1110 | } | |
1111 | ||
ba3c69a9 JH |
1112 | static const char gpg_sig_header[] = "gpgsig"; |
1113 | static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1; | |
1114 | ||
1115 | static int do_sign_commit(struct strbuf *buf, const char *keyid) | |
1116 | { | |
1117 | struct strbuf sig = STRBUF_INIT; | |
1118 | int inspos, copypos; | |
3324dd8f | 1119 | const char *eoh; |
ba3c69a9 JH |
1120 | |
1121 | /* find the end of the header */ | |
3324dd8f JS |
1122 | eoh = strstr(buf->buf, "\n\n"); |
1123 | if (!eoh) | |
1124 | inspos = buf->len; | |
1125 | else | |
1126 | inspos = eoh - buf->buf + 1; | |
ba3c69a9 JH |
1127 | |
1128 | if (!keyid || !*keyid) | |
1129 | keyid = get_signing_key(); | |
1130 | if (sign_buffer(buf, &sig, keyid)) { | |
1131 | strbuf_release(&sig); | |
1132 | return -1; | |
1133 | } | |
1134 | ||
1135 | for (copypos = 0; sig.buf[copypos]; ) { | |
1136 | const char *bol = sig.buf + copypos; | |
1137 | const char *eol = strchrnul(bol, '\n'); | |
1138 | int len = (eol - bol) + !!*eol; | |
1139 | ||
1140 | if (!copypos) { | |
1141 | strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len); | |
1142 | inspos += gpg_sig_header_len; | |
1143 | } | |
1144 | strbuf_insert(buf, inspos++, " ", 1); | |
1145 | strbuf_insert(buf, inspos, bol, len); | |
1146 | inspos += len; | |
1147 | copypos += len; | |
1148 | } | |
1149 | strbuf_release(&sig); | |
1150 | return 0; | |
1151 | } | |
1152 | ||
218aa3a6 | 1153 | int parse_signed_commit(const struct commit *commit, |
0c37f1fc JH |
1154 | struct strbuf *payload, struct strbuf *signature) |
1155 | { | |
218aa3a6 | 1156 | |
0c37f1fc | 1157 | unsigned long size; |
218aa3a6 | 1158 | const char *buffer = get_commit_buffer(commit, &size); |
0c37f1fc | 1159 | int in_signature, saw_signature = -1; |
218aa3a6 | 1160 | const char *line, *tail; |
0c37f1fc JH |
1161 | |
1162 | line = buffer; | |
1163 | tail = buffer + size; | |
1164 | in_signature = 0; | |
1165 | saw_signature = 0; | |
1166 | while (line < tail) { | |
1167 | const char *sig = NULL; | |
218aa3a6 | 1168 | const char *next = memchr(line, '\n', tail - line); |
0c37f1fc JH |
1169 | |
1170 | next = next ? next + 1 : tail; | |
1171 | if (in_signature && line[0] == ' ') | |
1172 | sig = line + 1; | |
59556548 | 1173 | else if (starts_with(line, gpg_sig_header) && |
0c37f1fc JH |
1174 | line[gpg_sig_header_len] == ' ') |
1175 | sig = line + gpg_sig_header_len + 1; | |
1176 | if (sig) { | |
1177 | strbuf_add(signature, sig, next - sig); | |
1178 | saw_signature = 1; | |
1179 | in_signature = 1; | |
1180 | } else { | |
1181 | if (*line == '\n') | |
1182 | /* dump the whole remainder of the buffer */ | |
1183 | next = tail; | |
1184 | strbuf_add(payload, line, next - line); | |
1185 | in_signature = 0; | |
1186 | } | |
1187 | line = next; | |
1188 | } | |
218aa3a6 | 1189 | unuse_commit_buffer(commit, buffer); |
0c37f1fc JH |
1190 | return saw_signature; |
1191 | } | |
1192 | ||
0b05ab6f CC |
1193 | int remove_signature(struct strbuf *buf) |
1194 | { | |
1195 | const char *line = buf->buf; | |
1196 | const char *tail = buf->buf + buf->len; | |
1197 | int in_signature = 0; | |
1198 | const char *sig_start = NULL; | |
1199 | const char *sig_end = NULL; | |
1200 | ||
1201 | while (line < tail) { | |
1202 | const char *next = memchr(line, '\n', tail - line); | |
1203 | next = next ? next + 1 : tail; | |
1204 | ||
1205 | if (in_signature && line[0] == ' ') | |
1206 | sig_end = next; | |
1207 | else if (starts_with(line, gpg_sig_header) && | |
1208 | line[gpg_sig_header_len] == ' ') { | |
1209 | sig_start = line; | |
1210 | sig_end = next; | |
1211 | in_signature = 1; | |
1212 | } else { | |
1213 | if (*line == '\n') | |
1214 | /* dump the whole remainder of the buffer */ | |
1215 | next = tail; | |
1216 | in_signature = 0; | |
1217 | } | |
1218 | line = next; | |
1219 | } | |
1220 | ||
1221 | if (sig_start) | |
1222 | strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start); | |
1223 | ||
1224 | return sig_start != NULL; | |
1225 | } | |
1226 | ||
5231c633 JH |
1227 | static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail) |
1228 | { | |
1229 | struct merge_remote_desc *desc; | |
1230 | struct commit_extra_header *mergetag; | |
1231 | char *buf; | |
1232 | unsigned long size, len; | |
1233 | enum object_type type; | |
1234 | ||
1235 | desc = merge_remote_util(parent); | |
1236 | if (!desc || !desc->obj) | |
1237 | return; | |
b4f5aca4 | 1238 | buf = read_object_file(&desc->obj->oid, &type, &size); |
5231c633 JH |
1239 | if (!buf || type != OBJ_TAG) |
1240 | goto free_return; | |
1241 | len = parse_signature(buf, size); | |
1242 | if (size == len) | |
1243 | goto free_return; | |
1244 | /* | |
1245 | * We could verify this signature and either omit the tag when | |
1246 | * it does not validate, but the integrator may not have the | |
1247 | * public key of the signer of the tag he is merging, while a | |
1248 | * later auditor may have it while auditing, so let's not run | |
1249 | * verify-signed-buffer here for now... | |
1250 | * | |
1251 | * if (verify_signed_buffer(buf, len, buf + len, size - len, ...)) | |
1252 | * warn("warning: signed tag unverified."); | |
1253 | */ | |
1254 | mergetag = xcalloc(1, sizeof(*mergetag)); | |
1255 | mergetag->key = xstrdup("mergetag"); | |
1256 | mergetag->value = buf; | |
1257 | mergetag->len = size; | |
1258 | ||
1259 | **tail = mergetag; | |
1260 | *tail = &mergetag->next; | |
1261 | return; | |
1262 | ||
1263 | free_return: | |
1264 | free(buf); | |
1265 | } | |
1266 | ||
434060ec | 1267 | int check_commit_signature(const struct commit *commit, struct signature_check *sigc) |
ffb6d7d5 SG |
1268 | { |
1269 | struct strbuf payload = STRBUF_INIT; | |
1270 | struct strbuf signature = STRBUF_INIT; | |
434060ec | 1271 | int ret = 1; |
ffb6d7d5 SG |
1272 | |
1273 | sigc->result = 'N'; | |
1274 | ||
218aa3a6 | 1275 | if (parse_signed_commit(commit, &payload, &signature) <= 0) |
ffb6d7d5 | 1276 | goto out; |
434060ec | 1277 | ret = check_signature(payload.buf, payload.len, signature.buf, |
1278 | signature.len, sigc); | |
ffb6d7d5 SG |
1279 | |
1280 | out: | |
ffb6d7d5 SG |
1281 | strbuf_release(&payload); |
1282 | strbuf_release(&signature); | |
434060ec | 1283 | |
1284 | return ret; | |
ffb6d7d5 SG |
1285 | } |
1286 | ||
1287 | ||
1288 | ||
5231c633 JH |
1289 | void append_merge_tag_headers(struct commit_list *parents, |
1290 | struct commit_extra_header ***tail) | |
1291 | { | |
1292 | while (parents) { | |
1293 | struct commit *parent = parents->item; | |
1294 | handle_signed_tag(parent, tail); | |
1295 | parents = parents->next; | |
1296 | } | |
1297 | } | |
1298 | ||
1299 | static void add_extra_header(struct strbuf *buffer, | |
1300 | struct commit_extra_header *extra) | |
1301 | { | |
1302 | strbuf_addstr(buffer, extra->key); | |
ed7a42a0 JH |
1303 | if (extra->len) |
1304 | strbuf_add_lines(buffer, " ", extra->value, extra->len); | |
1305 | else | |
1306 | strbuf_addch(buffer, '\n'); | |
1307 | } | |
1308 | ||
c871a1d1 JH |
1309 | struct commit_extra_header *read_commit_extra_headers(struct commit *commit, |
1310 | const char **exclude) | |
ed7a42a0 JH |
1311 | { |
1312 | struct commit_extra_header *extra = NULL; | |
1313 | unsigned long size; | |
218aa3a6 JK |
1314 | const char *buffer = get_commit_buffer(commit, &size); |
1315 | extra = read_commit_extra_header_lines(buffer, size, exclude); | |
1316 | unuse_commit_buffer(commit, buffer); | |
ed7a42a0 JH |
1317 | return extra; |
1318 | } | |
1319 | ||
fef461ea | 1320 | int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data) |
063da62b CC |
1321 | { |
1322 | struct commit_extra_header *extra, *to_free; | |
fef461ea | 1323 | int res = 0; |
063da62b CC |
1324 | |
1325 | to_free = read_commit_extra_headers(commit, NULL); | |
fef461ea | 1326 | for (extra = to_free; !res && extra; extra = extra->next) { |
063da62b CC |
1327 | if (strcmp(extra->key, "mergetag")) |
1328 | continue; /* not a merge tag */ | |
fef461ea | 1329 | res = fn(commit, extra, data); |
063da62b CC |
1330 | } |
1331 | free_commit_extra_headers(to_free); | |
fef461ea | 1332 | return res; |
063da62b CC |
1333 | } |
1334 | ||
ed7a42a0 JH |
1335 | static inline int standard_header_field(const char *field, size_t len) |
1336 | { | |
b072504c RS |
1337 | return ((len == 4 && !memcmp(field, "tree", 4)) || |
1338 | (len == 6 && !memcmp(field, "parent", 6)) || | |
1339 | (len == 6 && !memcmp(field, "author", 6)) || | |
1340 | (len == 9 && !memcmp(field, "committer", 9)) || | |
1341 | (len == 8 && !memcmp(field, "encoding", 8))); | |
ed7a42a0 JH |
1342 | } |
1343 | ||
c871a1d1 JH |
1344 | static int excluded_header_field(const char *field, size_t len, const char **exclude) |
1345 | { | |
1346 | if (!exclude) | |
1347 | return 0; | |
1348 | ||
1349 | while (*exclude) { | |
1350 | size_t xlen = strlen(*exclude); | |
b072504c | 1351 | if (len == xlen && !memcmp(field, *exclude, xlen)) |
c871a1d1 JH |
1352 | return 1; |
1353 | exclude++; | |
1354 | } | |
1355 | return 0; | |
1356 | } | |
1357 | ||
82a75299 JH |
1358 | static struct commit_extra_header *read_commit_extra_header_lines( |
1359 | const char *buffer, size_t size, | |
1360 | const char **exclude) | |
ed7a42a0 JH |
1361 | { |
1362 | struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL; | |
1363 | const char *line, *next, *eof, *eob; | |
1364 | struct strbuf buf = STRBUF_INIT; | |
1365 | ||
1366 | for (line = buffer, eob = line + size; | |
1367 | line < eob && *line != '\n'; | |
1368 | line = next) { | |
1369 | next = memchr(line, '\n', eob - line); | |
1370 | next = next ? next + 1 : eob; | |
1371 | if (*line == ' ') { | |
1372 | /* continuation */ | |
1373 | if (it) | |
1374 | strbuf_add(&buf, line + 1, next - (line + 1)); | |
1375 | continue; | |
1376 | } | |
1377 | if (it) | |
1378 | it->value = strbuf_detach(&buf, &it->len); | |
1379 | strbuf_reset(&buf); | |
1380 | it = NULL; | |
1381 | ||
50a01cc4 RS |
1382 | eof = memchr(line, ' ', next - line); |
1383 | if (!eof) | |
ed7a42a0 | 1384 | eof = next; |
b072504c RS |
1385 | else if (standard_header_field(line, eof - line) || |
1386 | excluded_header_field(line, eof - line, exclude)) | |
ed7a42a0 JH |
1387 | continue; |
1388 | ||
1389 | it = xcalloc(1, sizeof(*it)); | |
1390 | it->key = xmemdupz(line, eof-line); | |
1391 | *tail = it; | |
1392 | tail = &it->next; | |
1393 | if (eof + 1 < next) | |
1394 | strbuf_add(&buf, eof + 1, next - (eof + 1)); | |
1395 | } | |
1396 | if (it) | |
1397 | it->value = strbuf_detach(&buf, &it->len); | |
1398 | return extra; | |
5231c633 JH |
1399 | } |
1400 | ||
1401 | void free_commit_extra_headers(struct commit_extra_header *extra) | |
1402 | { | |
1403 | while (extra) { | |
1404 | struct commit_extra_header *next = extra->next; | |
1405 | free(extra->key); | |
1406 | free(extra->value); | |
1407 | free(extra); | |
1408 | extra = next; | |
1409 | } | |
1410 | } | |
1411 | ||
5078f344 PO |
1412 | int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree, |
1413 | struct commit_list *parents, struct object_id *ret, | |
ba3c69a9 | 1414 | const char *author, const char *sign_commit) |
5231c633 JH |
1415 | { |
1416 | struct commit_extra_header *extra = NULL, **tail = &extra; | |
1417 | int result; | |
1418 | ||
1419 | append_merge_tag_headers(parents, &tail); | |
3ffefb54 | 1420 | result = commit_tree_extended(msg, msg_len, tree, parents, ret, |
ba3c69a9 | 1421 | author, sign_commit, extra); |
5231c633 JH |
1422 | free_commit_extra_headers(extra); |
1423 | return result; | |
1424 | } | |
1425 | ||
08a94a14 LT |
1426 | static int find_invalid_utf8(const char *buf, int len) |
1427 | { | |
1428 | int offset = 0; | |
e82bd6cc | 1429 | static const unsigned int max_codepoint[] = { |
1430 | 0x7f, 0x7ff, 0xffff, 0x10ffff | |
1431 | }; | |
08a94a14 LT |
1432 | |
1433 | while (len) { | |
1434 | unsigned char c = *buf++; | |
1435 | int bytes, bad_offset; | |
28110d4b | 1436 | unsigned int codepoint; |
e82bd6cc | 1437 | unsigned int min_val, max_val; |
08a94a14 LT |
1438 | |
1439 | len--; | |
1440 | offset++; | |
1441 | ||
1442 | /* Simple US-ASCII? No worries. */ | |
1443 | if (c < 0x80) | |
1444 | continue; | |
1445 | ||
1446 | bad_offset = offset-1; | |
1447 | ||
1448 | /* | |
1449 | * Count how many more high bits set: that's how | |
1450 | * many more bytes this sequence should have. | |
1451 | */ | |
1452 | bytes = 0; | |
1453 | while (c & 0x40) { | |
1454 | c <<= 1; | |
1455 | bytes++; | |
1456 | } | |
1457 | ||
28110d4b | 1458 | /* |
1459 | * Must be between 1 and 3 more bytes. Longer sequences result in | |
1460 | * codepoints beyond U+10FFFF, which are guaranteed never to exist. | |
1461 | */ | |
1462 | if (bytes < 1 || 3 < bytes) | |
08a94a14 LT |
1463 | return bad_offset; |
1464 | ||
1465 | /* Do we *have* that many bytes? */ | |
1466 | if (len < bytes) | |
1467 | return bad_offset; | |
1468 | ||
e82bd6cc | 1469 | /* |
1470 | * Place the encoded bits at the bottom of the value and compute the | |
1471 | * valid range. | |
1472 | */ | |
28110d4b | 1473 | codepoint = (c & 0x7f) >> bytes; |
e82bd6cc | 1474 | min_val = max_codepoint[bytes-1] + 1; |
1475 | max_val = max_codepoint[bytes]; | |
28110d4b | 1476 | |
08a94a14 LT |
1477 | offset += bytes; |
1478 | len -= bytes; | |
1479 | ||
1480 | /* And verify that they are good continuation bytes */ | |
1481 | do { | |
28110d4b | 1482 | codepoint <<= 6; |
1483 | codepoint |= *buf & 0x3f; | |
08a94a14 LT |
1484 | if ((*buf++ & 0xc0) != 0x80) |
1485 | return bad_offset; | |
1486 | } while (--bytes); | |
1487 | ||
e82bd6cc | 1488 | /* Reject codepoints that are out of range for the sequence length. */ |
1489 | if (codepoint < min_val || codepoint > max_val) | |
28110d4b | 1490 | return bad_offset; |
1491 | /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */ | |
1492 | if ((codepoint & 0x1ff800) == 0xd800) | |
1493 | return bad_offset; | |
81050ac6 | 1494 | /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */ |
dc773a67 | 1495 | if ((codepoint & 0xfffe) == 0xfffe) |
81050ac6 PK |
1496 | return bad_offset; |
1497 | /* So are anything in the range U+FDD0..U+FDEF. */ | |
1498 | if (codepoint >= 0xfdd0 && codepoint <= 0xfdef) | |
28110d4b | 1499 | return bad_offset; |
08a94a14 LT |
1500 | } |
1501 | return -1; | |
1502 | } | |
1503 | ||
1504 | /* | |
1505 | * This verifies that the buffer is in proper utf8 format. | |
1506 | * | |
1507 | * If it isn't, it assumes any non-utf8 characters are Latin1, | |
1508 | * and does the conversion. | |
08a94a14 LT |
1509 | */ |
1510 | static int verify_utf8(struct strbuf *buf) | |
1511 | { | |
1512 | int ok = 1; | |
1513 | long pos = 0; | |
1514 | ||
1515 | for (;;) { | |
1516 | int bad; | |
1517 | unsigned char c; | |
1518 | unsigned char replace[2]; | |
1519 | ||
1520 | bad = find_invalid_utf8(buf->buf + pos, buf->len - pos); | |
1521 | if (bad < 0) | |
1522 | return ok; | |
1523 | pos += bad; | |
1524 | ok = 0; | |
1525 | c = buf->buf[pos]; | |
1526 | strbuf_remove(buf, pos, 1); | |
1527 | ||
1528 | /* We know 'c' must be in the range 128-255 */ | |
1529 | replace[0] = 0xc0 + (c >> 6); | |
1530 | replace[1] = 0x80 + (c & 0x3f); | |
1531 | strbuf_insert(buf, pos, replace, 2); | |
1532 | pos += 2; | |
1533 | } | |
1534 | } | |
1535 | ||
40d52ff7 | 1536 | static const char commit_utf8_warn[] = |
4fa4b315 VA |
1537 | N_("Warning: commit message did not conform to UTF-8.\n" |
1538 | "You may want to amend it after fixing the message, or set the config\n" | |
1539 | "variable i18n.commitencoding to the encoding your project uses.\n"); | |
40d52ff7 | 1540 | |
3ffefb54 | 1541 | int commit_tree_extended(const char *msg, size_t msg_len, |
5078f344 PO |
1542 | const struct object_id *tree, |
1543 | struct commit_list *parents, struct object_id *ret, | |
ba3c69a9 JH |
1544 | const char *author, const char *sign_commit, |
1545 | struct commit_extra_header *extra) | |
40d52ff7 JK |
1546 | { |
1547 | int result; | |
1548 | int encoding_is_utf8; | |
1549 | struct strbuf buffer; | |
1550 | ||
e816caa0 | 1551 | assert_oid_type(tree, OBJ_TREE); |
40d52ff7 | 1552 | |
3ffefb54 | 1553 | if (memchr(msg, '\0', msg_len)) |
37576c14 NTND |
1554 | return error("a NUL byte in commit log message not allowed."); |
1555 | ||
40d52ff7 JK |
1556 | /* Not having i18n.commitencoding is the same as having utf-8 */ |
1557 | encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); | |
1558 | ||
1559 | strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */ | |
5078f344 | 1560 | strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree)); |
40d52ff7 JK |
1561 | |
1562 | /* | |
1563 | * NOTE! This ordering means that the same exact tree merged with a | |
1564 | * different order of parents will be a _different_ changeset even | |
1565 | * if everything else stays the same. | |
1566 | */ | |
1567 | while (parents) { | |
e510ab89 | 1568 | struct commit *parent = pop_commit(&parents); |
40d52ff7 | 1569 | strbuf_addf(&buffer, "parent %s\n", |
f2fd0760 | 1570 | oid_to_hex(&parent->object.oid)); |
40d52ff7 JK |
1571 | } |
1572 | ||
1573 | /* Person/date information */ | |
1574 | if (!author) | |
f9bc573f | 1575 | author = git_author_info(IDENT_STRICT); |
40d52ff7 | 1576 | strbuf_addf(&buffer, "author %s\n", author); |
f9bc573f | 1577 | strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT)); |
40d52ff7 JK |
1578 | if (!encoding_is_utf8) |
1579 | strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding); | |
5231c633 JH |
1580 | |
1581 | while (extra) { | |
1582 | add_extra_header(&buffer, extra); | |
1583 | extra = extra->next; | |
1584 | } | |
40d52ff7 JK |
1585 | strbuf_addch(&buffer, '\n'); |
1586 | ||
1587 | /* And add the comment */ | |
3ffefb54 | 1588 | strbuf_add(&buffer, msg, msg_len); |
40d52ff7 JK |
1589 | |
1590 | /* And check the encoding */ | |
08a94a14 | 1591 | if (encoding_is_utf8 && !verify_utf8(&buffer)) |
4fa4b315 | 1592 | fprintf(stderr, _(commit_utf8_warn)); |
40d52ff7 | 1593 | |
e505146d RS |
1594 | if (sign_commit && do_sign_commit(&buffer, sign_commit)) { |
1595 | result = -1; | |
1596 | goto out; | |
1597 | } | |
ba3c69a9 | 1598 | |
a09c985e | 1599 | result = write_object_file(buffer.buf, buffer.len, commit_type, ret); |
e505146d | 1600 | out: |
40d52ff7 JK |
1601 | strbuf_release(&buffer); |
1602 | return result; | |
1603 | } | |
ae8e4c9c | 1604 | |
beb518c9 RS |
1605 | void set_merge_remote_desc(struct commit *commit, |
1606 | const char *name, struct object *obj) | |
1607 | { | |
1608 | struct merge_remote_desc *desc; | |
5447a76a | 1609 | FLEX_ALLOC_STR(desc, name, name); |
beb518c9 | 1610 | desc->obj = obj; |
beb518c9 RS |
1611 | commit->util = desc; |
1612 | } | |
1613 | ||
ae8e4c9c JH |
1614 | struct commit *get_merge_parent(const char *name) |
1615 | { | |
1616 | struct object *obj; | |
1617 | struct commit *commit; | |
7683e2e6 | 1618 | struct object_id oid; |
e82caf38 | 1619 | if (get_oid(name, &oid)) |
ae8e4c9c | 1620 | return NULL; |
c251c83d | 1621 | obj = parse_object(&oid); |
ae8e4c9c | 1622 | commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT); |
beb518c9 RS |
1623 | if (commit && !commit->util) |
1624 | set_merge_remote_desc(commit, name, obj); | |
ae8e4c9c JH |
1625 | return commit; |
1626 | } | |
89b5f1d9 RS |
1627 | |
1628 | /* | |
1629 | * Append a commit to the end of the commit_list. | |
1630 | * | |
1631 | * next starts by pointing to the variable that holds the head of an | |
1632 | * empty commit_list, and is updated to point to the "next" field of | |
1633 | * the last item on the list as new commits are appended. | |
1634 | * | |
1635 | * Usage example: | |
1636 | * | |
1637 | * struct commit_list *list; | |
1638 | * struct commit_list **next = &list; | |
1639 | * | |
1640 | * next = commit_list_append(c1, next); | |
1641 | * next = commit_list_append(c2, next); | |
1642 | * assert(commit_list_count(list) == 2); | |
1643 | * return list; | |
1644 | */ | |
1645 | struct commit_list **commit_list_append(struct commit *commit, | |
1646 | struct commit_list **next) | |
1647 | { | |
258c03eb BW |
1648 | struct commit_list *new_commit = xmalloc(sizeof(struct commit_list)); |
1649 | new_commit->item = commit; | |
1650 | *next = new_commit; | |
1651 | new_commit->next = NULL; | |
1652 | return &new_commit->next; | |
89b5f1d9 | 1653 | } |
efc7df45 | 1654 | |
fe6eb7f2 JK |
1655 | const char *find_commit_header(const char *msg, const char *key, size_t *out_len) |
1656 | { | |
1657 | int key_len = strlen(key); | |
1658 | const char *line = msg; | |
1659 | ||
1660 | while (line) { | |
1661 | const char *eol = strchrnul(line, '\n'); | |
1662 | ||
1663 | if (line == eol) | |
1664 | return NULL; | |
1665 | ||
1666 | if (eol - line > key_len && | |
1667 | !strncmp(line, key, key_len) && | |
1668 | line[key_len] == ' ') { | |
1669 | *out_len = eol - line - key_len - 1; | |
1670 | return line + key_len + 1; | |
1671 | } | |
1672 | line = *eol ? eol + 1 : NULL; | |
1673 | } | |
1674 | return NULL; | |
1675 | } | |
0ed8a4e1 | 1676 | |
8c384589 | 1677 | /* |
710714aa | 1678 | * Inspect the given string and determine the true "end" of the log message, in |
8c384589 | 1679 | * order to find where to put a new Signed-off-by: line. Ignored are |
d76650b8 BM |
1680 | * trailing comment lines and blank lines. To support "git commit -s |
1681 | * --amend" on an existing commit, we also ignore "Conflicts:". To | |
1682 | * support "git commit -v", we truncate at cut lines. | |
8c384589 CC |
1683 | * |
1684 | * Returns the number of bytes from the tail to ignore, to be fed as | |
1685 | * the second parameter to append_signoff(). | |
1686 | */ | |
710714aa | 1687 | int ignore_non_trailer(const char *buf, size_t len) |
8c384589 CC |
1688 | { |
1689 | int boc = 0; | |
1690 | int bol = 0; | |
1691 | int in_old_conflicts_block = 0; | |
d76650b8 | 1692 | size_t cutoff = wt_status_locate_end(buf, len); |
8c384589 | 1693 | |
d76650b8 | 1694 | while (bol < cutoff) { |
710714aa | 1695 | const char *next_line = memchr(buf + bol, '\n', len - bol); |
8c384589 | 1696 | |
710714aa JT |
1697 | if (!next_line) |
1698 | next_line = buf + len; | |
8c384589 CC |
1699 | else |
1700 | next_line++; | |
1701 | ||
710714aa | 1702 | if (buf[bol] == comment_line_char || buf[bol] == '\n') { |
8c384589 CC |
1703 | /* is this the first of the run of comments? */ |
1704 | if (!boc) | |
1705 | boc = bol; | |
1706 | /* otherwise, it is just continuing */ | |
710714aa | 1707 | } else if (starts_with(buf + bol, "Conflicts:\n")) { |
8c384589 CC |
1708 | in_old_conflicts_block = 1; |
1709 | if (!boc) | |
1710 | boc = bol; | |
710714aa | 1711 | } else if (in_old_conflicts_block && buf[bol] == '\t') { |
8c384589 CC |
1712 | ; /* a pathname in the conflicts block */ |
1713 | } else if (boc) { | |
1714 | /* the previous was not trailing comment */ | |
1715 | boc = 0; | |
1716 | in_old_conflicts_block = 0; | |
1717 | } | |
710714aa | 1718 | bol = next_line - buf; |
8c384589 | 1719 | } |
d76650b8 | 1720 | return boc ? len - boc : len - cutoff; |
8c384589 | 1721 | } |