]>
Commit | Line | Data |
---|---|---|
d812c3b6 | 1 | #include "git-compat-util.h" |
961784ee | 2 | #include "tag.h" |
175785e5 | 3 | #include "commit.h" |
177722b3 | 4 | #include "commit-graph.h" |
7ee24e18 | 5 | #include "environment.h" |
f394e093 | 6 | #include "gettext.h" |
41771fa4 | 7 | #include "hex.h" |
6a1a79fd | 8 | #include "repository.h" |
dabab1d6 | 9 | #include "object-name.h" |
a034e910 | 10 | #include "object-store-ll.h" |
52883fbd | 11 | #include "utf8.h" |
199c45bf JH |
12 | #include "diff.h" |
13 | #include "revision.h" | |
a97a7468 | 14 | #include "notes.h" |
14ba97f8 | 15 | #include "alloc.h" |
ba3c69a9 | 16 | #include "gpg-interface.h" |
46905893 | 17 | #include "mergesort.h" |
a84b794a | 18 | #include "commit-slab.h" |
da24b104 | 19 | #include "prio-queue.h" |
bc626927 | 20 | #include "hash-lookup.h" |
d76650b8 | 21 | #include "wt-status.h" |
f9f99b3f | 22 | #include "advice.h" |
103148aa | 23 | #include "refs.h" |
02931217 | 24 | #include "commit-reach.h" |
e38da487 | 25 | #include "setup.h" |
120ad2b0 | 26 | #include "shallow.h" |
d4a4f929 | 27 | #include "tree.h" |
f443246b | 28 | #include "hook.h" |
7a5d6044 | 29 | #include "parse.h" |
6206089c | 30 | #include "object-file-convert.h" |
175785e5 | 31 | |
82a75299 JH |
32 | static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); |
33 | ||
60ab26de | 34 | int save_commit_buffer = 1; |
ab628588 | 35 | int no_graft_file_deprecated_advice; |
60ab26de | 36 | |
175785e5 DB |
37 | const char *commit_type = "commit"; |
38 | ||
d9a05e74 | 39 | struct commit *lookup_commit_reference_gently(struct repository *r, |
21e1ee8f | 40 | const struct object_id *oid, int quiet) |
961784ee | 41 | { |
d9a05e74 SB |
42 | struct object *obj = deref_tag(r, |
43 | parse_object(r, oid), | |
109cd76d | 44 | NULL, 0); |
961784ee LT |
45 | |
46 | if (!obj) | |
47 | return NULL; | |
6da43d93 | 48 | return object_as_type(obj, OBJ_COMMIT, quiet); |
f76412ed JH |
49 | } |
50 | ||
1f6c72fe | 51 | struct commit *lookup_commit_reference(struct repository *r, const struct object_id *oid) |
f76412ed | 52 | { |
1f6c72fe | 53 | return lookup_commit_reference_gently(r, oid, 0); |
961784ee LT |
54 | } |
55 | ||
bc83266a | 56 | struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name) |
baf18fc2 | 57 | { |
2122f675 | 58 | struct commit *c = lookup_commit_reference(the_repository, oid); |
baf18fc2 NTND |
59 | if (!c) |
60 | die(_("could not parse %s"), ref_name); | |
9001dc2a | 61 | if (!oideq(oid, &c->object.oid)) { |
baf18fc2 | 62 | warning(_("%s %s is not a commit!"), |
bc83266a | 63 | ref_name, oid_to_hex(oid)); |
baf18fc2 NTND |
64 | } |
65 | return c; | |
66 | } | |
67 | ||
b8dbfd03 PW |
68 | struct commit *lookup_commit_object(struct repository *r, |
69 | const struct object_id *oid) | |
70 | { | |
71 | struct object *obj = parse_object(r, oid); | |
72 | return obj ? object_as_type(obj, OBJ_COMMIT, 0) : NULL; | |
73 | ||
74 | } | |
75 | ||
bacf1687 | 76 | struct commit *lookup_commit(struct repository *r, const struct object_id *oid) |
175785e5 | 77 | { |
d0229abd | 78 | struct object *obj = lookup_object(r, oid); |
d36f51c1 | 79 | if (!obj) |
a378509e | 80 | return create_object(r, oid, alloc_commit_node(r)); |
6da43d93 | 81 | return object_as_type(obj, OBJ_COMMIT, 0); |
175785e5 DB |
82 | } |
83 | ||
a6fa5992 PN |
84 | struct commit *lookup_commit_reference_by_name(const char *name) |
85 | { | |
7683e2e6 | 86 | struct object_id oid; |
a6fa5992 PN |
87 | struct commit *commit; |
88 | ||
d850b7a5 | 89 | if (repo_get_oid_committish(the_repository, name, &oid)) |
a6fa5992 | 90 | return NULL; |
2122f675 | 91 | commit = lookup_commit_reference(the_repository, &oid); |
ecb5091f | 92 | if (repo_parse_commit(the_repository, commit)) |
a6fa5992 PN |
93 | return NULL; |
94 | return commit; | |
95 | } | |
96 | ||
dddbad72 | 97 | static timestamp_t parse_commit_date(const char *buf, const char *tail) |
175785e5 | 98 | { |
0a617799 | 99 | const char *dateptr; |
ea1615df | 100 | const char *eol; |
175785e5 | 101 | |
0a617799 MK |
102 | if (buf + 6 >= tail) |
103 | return 0; | |
175785e5 DB |
104 | if (memcmp(buf, "author", 6)) |
105 | return 0; | |
0a617799 | 106 | while (buf < tail && *buf++ != '\n') |
175785e5 | 107 | /* nada */; |
0a617799 MK |
108 | if (buf + 9 >= tail) |
109 | return 0; | |
175785e5 DB |
110 | if (memcmp(buf, "committer", 9)) |
111 | return 0; | |
ea1615df JK |
112 | |
113 | /* | |
114 | * Jump to end-of-line so that we can walk backwards to find the | |
115 | * end-of-email ">". This is more forgiving of malformed cases | |
116 | * because unexpected characters tend to be in the name and email | |
117 | * fields. | |
118 | */ | |
119 | eol = memchr(buf, '\n', tail - buf); | |
120 | if (!eol) | |
0a617799 | 121 | return 0; |
ea1615df JK |
122 | dateptr = eol; |
123 | while (dateptr > buf && dateptr[-1] != '>') | |
124 | dateptr--; | |
089d9adf | 125 | if (dateptr == buf) |
0a617799 | 126 | return 0; |
ea1615df | 127 | |
089d9adf JK |
128 | /* |
129 | * Trim leading whitespace, but make sure we have at least one | |
130 | * non-whitespace character, as parse_timestamp() will otherwise walk | |
131 | * right past the newline we found in "eol" when skipping whitespace | |
132 | * itself. | |
133 | * | |
134 | * In theory it would be sufficient to allow any character not matched | |
135 | * by isspace(), but there's a catch: our isspace() does not | |
136 | * necessarily match the behavior of parse_timestamp(), as the latter | |
137 | * is implemented by system routines which match more exotic control | |
138 | * codes, or even locale-dependent sequences. | |
139 | * | |
140 | * Since we expect the timestamp to be a number, we can check for that. | |
141 | * Anything else (e.g., a non-numeric token like "foo") would just | |
142 | * cause parse_timestamp() to return 0 anyway. | |
143 | */ | |
144 | while (dateptr < eol && isspace(*dateptr)) | |
145 | dateptr++; | |
146 | if (!isdigit(*dateptr) && *dateptr != '-') | |
147 | return 0; | |
148 | ||
149 | /* | |
150 | * We know there is at least one digit (or dash), so we'll begin | |
151 | * parsing there and stop at worst case at eol. | |
90ef0f14 JK |
152 | * |
153 | * Note that we may feed parse_timestamp() extra characters here if the | |
154 | * commit is malformed, and it will parse as far as it can. For | |
155 | * example, "123foo456" would return "123". That might be questionable | |
156 | * (versus returning "0"), but it would help in a hypothetical case | |
157 | * like "123456+0100", where the whitespace from the timezone is | |
158 | * missing. Since such syntactic errors may be baked into history and | |
159 | * hard to correct now, let's err on trying to make our best guess | |
160 | * here, rather than insist on perfect syntax. | |
089d9adf | 161 | */ |
1aeb7e75 | 162 | return parse_timestamp(dateptr, NULL, 10); |
175785e5 DB |
163 | } |
164 | ||
8380dcd7 | 165 | static const struct object_id *commit_graft_oid_access(size_t index, const void *table) |
0a9136f3 | 166 | { |
8380dcd7 | 167 | const struct commit_graft * const *commit_graft_table = table; |
45ee13b9 | 168 | return &commit_graft_table[index]->oid; |
0a9136f3 DD |
169 | } |
170 | ||
98c431b6 | 171 | int commit_graft_pos(struct repository *r, const struct object_id *oid) |
5da5c8f4 | 172 | { |
45ee13b9 JK |
173 | return oid_pos(oid, r->parsed_objects->grafts, |
174 | r->parsed_objects->grafts_nr, | |
175 | commit_graft_oid_access); | |
5da5c8f4 JH |
176 | } |
177 | ||
4d4e49ff JT |
178 | static void unparse_commit(struct repository *r, const struct object_id *oid) |
179 | { | |
180 | struct commit *c = lookup_commit(r, oid); | |
181 | ||
182 | if (!c->object.parsed) | |
183 | return; | |
184 | free_commit_list(c->parents); | |
185 | c->parents = NULL; | |
186 | c->object.parsed = 0; | |
187 | } | |
188 | ||
a3b78e83 BW |
189 | int register_commit_graft(struct repository *r, struct commit_graft *graft, |
190 | int ignore_dups) | |
5040f17e | 191 | { |
98c431b6 | 192 | int pos = commit_graft_pos(r, &graft->oid); |
a6080a0a | 193 | |
5040f17e JH |
194 | if (0 <= pos) { |
195 | if (ignore_dups) | |
196 | free(graft); | |
197 | else { | |
a3b78e83 BW |
198 | free(r->parsed_objects->grafts[pos]); |
199 | r->parsed_objects->grafts[pos] = graft; | |
5040f17e JH |
200 | } |
201 | return 1; | |
202 | } | |
203 | pos = -pos - 1; | |
a3b78e83 BW |
204 | ALLOC_GROW(r->parsed_objects->grafts, |
205 | r->parsed_objects->grafts_nr + 1, | |
206 | r->parsed_objects->grafts_alloc); | |
207 | r->parsed_objects->grafts_nr++; | |
208 | if (pos < r->parsed_objects->grafts_nr) | |
209 | memmove(r->parsed_objects->grafts + pos + 1, | |
210 | r->parsed_objects->grafts + pos, | |
211 | (r->parsed_objects->grafts_nr - pos - 1) * | |
212 | sizeof(*r->parsed_objects->grafts)); | |
213 | r->parsed_objects->grafts[pos] = graft; | |
4d4e49ff | 214 | unparse_commit(r, &graft->oid); |
5040f17e JH |
215 | return 0; |
216 | } | |
217 | ||
9a934032 | 218 | struct commit_graft *read_graft_line(struct strbuf *line) |
5040f17e JH |
219 | { |
220 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
cfa5bf16 PO |
221 | int i, phase; |
222 | const char *tail = NULL; | |
5040f17e | 223 | struct commit_graft *graft = NULL; |
cfa5bf16 | 224 | struct object_id dummy_oid, *oid; |
5040f17e | 225 | |
9a934032 PO |
226 | strbuf_rtrim(line); |
227 | if (!line->len || line->buf[0] == '#') | |
5bc4ce58 | 228 | return NULL; |
cfa5bf16 PO |
229 | /* |
230 | * phase 0 verifies line, counts hashes in line and allocates graft | |
231 | * phase 1 fills graft | |
232 | */ | |
233 | for (phase = 0; phase < 2; phase++) { | |
234 | oid = graft ? &graft->oid : &dummy_oid; | |
235 | if (parse_oid_hex(line->buf, oid, &tail)) | |
5040f17e | 236 | goto bad_graft_data; |
cfa5bf16 PO |
237 | for (i = 0; *tail != '\0'; i++) { |
238 | oid = graft ? &graft->parent[i] : &dummy_oid; | |
239 | if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail)) | |
240 | goto bad_graft_data; | |
241 | } | |
242 | if (!graft) { | |
243 | graft = xmalloc(st_add(sizeof(*graft), | |
244 | st_mult(sizeof(struct object_id), i))); | |
245 | graft->nr_parent = i; | |
246 | } | |
5040f17e JH |
247 | } |
248 | return graft; | |
df5d43be RT |
249 | |
250 | bad_graft_data: | |
9a934032 | 251 | error("bad graft data: %s", line->buf); |
cfa5bf16 | 252 | assert(!graft); |
df5d43be | 253 | return NULL; |
5040f17e JH |
254 | } |
255 | ||
d0e5dd0e | 256 | static int read_graft_file(struct repository *r, const char *graft_file) |
5da5c8f4 | 257 | { |
e9d983f1 | 258 | FILE *fp = fopen_or_warn(graft_file, "r"); |
e228c173 | 259 | struct strbuf buf = STRBUF_INIT; |
5040f17e JH |
260 | if (!fp) |
261 | return -1; | |
ab628588 ÆAB |
262 | if (!no_graft_file_deprecated_advice && |
263 | advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED)) | |
f9f99b3f JS |
264 | advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n" |
265 | "and will be removed in a future Git version.\n" | |
266 | "\n" | |
267 | "Please use \"git replace --convert-graft-file\"\n" | |
268 | "to convert the grafts into replace refs.\n" | |
269 | "\n" | |
270 | "Turn this message off by running\n" | |
271 | "\"git config advice.graftFileDeprecated false\"")); | |
e228c173 | 272 | while (!strbuf_getwholeline(&buf, fp, '\n')) { |
5da5c8f4 | 273 | /* The format is just "Commit Parent1 Parent2 ...\n" */ |
9a934032 | 274 | struct commit_graft *graft = read_graft_line(&buf); |
5bc4ce58 JH |
275 | if (!graft) |
276 | continue; | |
d0e5dd0e | 277 | if (register_commit_graft(r, graft, 1)) |
e228c173 | 278 | error("duplicate graft data: %s", buf.buf); |
5da5c8f4 JH |
279 | } |
280 | fclose(fp); | |
e228c173 | 281 | strbuf_release(&buf); |
5040f17e JH |
282 | return 0; |
283 | } | |
284 | ||
20fd6d57 | 285 | void prepare_commit_graft(struct repository *r) |
5040f17e | 286 | { |
5040f17e JH |
287 | char *graft_file; |
288 | ||
2f6c767f | 289 | if (r->parsed_objects->commit_graft_prepared) |
5040f17e | 290 | return; |
14a9bd28 JK |
291 | if (!startup_info->have_repository) |
292 | return; | |
293 | ||
2f6c767f SB |
294 | graft_file = get_graft_file(r); |
295 | read_graft_file(r, graft_file); | |
ed09aef0 | 296 | /* make sure shallows are read */ |
2f6c767f SB |
297 | is_repository_shallow(r); |
298 | r->parsed_objects->commit_graft_prepared = 1; | |
5da5c8f4 JH |
299 | } |
300 | ||
b9dbddf6 | 301 | struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid) |
5da5c8f4 JH |
302 | { |
303 | int pos; | |
b9dbddf6 | 304 | prepare_commit_graft(r); |
98c431b6 | 305 | pos = commit_graft_pos(r, oid); |
5da5c8f4 JH |
306 | if (pos < 0) |
307 | return NULL; | |
b9dbddf6 | 308 | return r->parsed_objects->grafts[pos]; |
5da5c8f4 JH |
309 | } |
310 | ||
09d46644 | 311 | int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data) |
ed09aef0 | 312 | { |
09d46644 | 313 | int i, ret; |
6a1a79fd JN |
314 | for (i = ret = 0; i < the_repository->parsed_objects->grafts_nr && !ret; i++) |
315 | ret = fn(the_repository->parsed_objects->grafts[i], cb_data); | |
09d46644 | 316 | return ret; |
ed09aef0 JS |
317 | } |
318 | ||
2a69ff09 JT |
319 | void reset_commit_grafts(struct repository *r) |
320 | { | |
321 | int i; | |
322 | ||
4d4e49ff JT |
323 | for (i = 0; i < r->parsed_objects->grafts_nr; i++) { |
324 | unparse_commit(r, &r->parsed_objects->grafts[i]->oid); | |
2a69ff09 | 325 | free(r->parsed_objects->grafts[i]); |
4d4e49ff | 326 | } |
2a69ff09 JT |
327 | r->parsed_objects->grafts_nr = 0; |
328 | r->parsed_objects->commit_graft_prepared = 0; | |
329 | } | |
330 | ||
8597ea3a JK |
331 | struct commit_buffer { |
332 | void *buffer; | |
333 | unsigned long size; | |
334 | }; | |
335 | define_commit_slab(buffer_slab, struct commit_buffer); | |
c1b3c71f | 336 | |
65ea9d4b | 337 | struct buffer_slab *allocate_commit_buffer_slab(void) |
66c2827e | 338 | { |
65ea9d4b SB |
339 | struct buffer_slab *bs = xmalloc(sizeof(*bs)); |
340 | init_buffer_slab(bs); | |
341 | return bs; | |
342 | } | |
343 | ||
344 | void free_commit_buffer_slab(struct buffer_slab *bs) | |
345 | { | |
346 | clear_buffer_slab(bs); | |
347 | free(bs); | |
348 | } | |
c1b3c71f | 349 | |
1a40fc45 | 350 | void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer, unsigned long size) |
66c2827e | 351 | { |
65ea9d4b | 352 | struct commit_buffer *v = buffer_slab_at( |
1a40fc45 | 353 | r->parsed_objects->buffer_slab, commit); |
8597ea3a JK |
354 | v->buffer = buffer; |
355 | v->size = size; | |
66c2827e JK |
356 | } |
357 | ||
4ff7e5c9 | 358 | const void *get_cached_commit_buffer(struct repository *r, const struct commit *commit, unsigned long *sizep) |
152ff1cc | 359 | { |
65ea9d4b | 360 | struct commit_buffer *v = buffer_slab_peek( |
4ff7e5c9 | 361 | r->parsed_objects->buffer_slab, commit); |
862e730e JH |
362 | if (!v) { |
363 | if (sizep) | |
364 | *sizep = 0; | |
365 | return NULL; | |
366 | } | |
8597ea3a JK |
367 | if (sizep) |
368 | *sizep = v->size; | |
369 | return v->buffer; | |
152ff1cc JK |
370 | } |
371 | ||
07de3fd8 SB |
372 | const void *repo_get_commit_buffer(struct repository *r, |
373 | const struct commit *commit, | |
374 | unsigned long *sizep) | |
152ff1cc | 375 | { |
07de3fd8 | 376 | const void *ret = get_cached_commit_buffer(r, commit, sizep); |
152ff1cc JK |
377 | if (!ret) { |
378 | enum object_type type; | |
379 | unsigned long size; | |
07de3fd8 | 380 | ret = repo_read_object_file(r, &commit->object.oid, &type, &size); |
152ff1cc JK |
381 | if (!ret) |
382 | die("cannot read commit object %s", | |
f2fd0760 | 383 | oid_to_hex(&commit->object.oid)); |
152ff1cc JK |
384 | if (type != OBJ_COMMIT) |
385 | die("expected commit for %s, got %s", | |
debca9d2 | 386 | oid_to_hex(&commit->object.oid), type_name(type)); |
8597ea3a JK |
387 | if (sizep) |
388 | *sizep = size; | |
152ff1cc JK |
389 | } |
390 | return ret; | |
391 | } | |
392 | ||
70315373 SB |
393 | void repo_unuse_commit_buffer(struct repository *r, |
394 | const struct commit *commit, | |
395 | const void *buffer) | |
152ff1cc | 396 | { |
65ea9d4b | 397 | struct commit_buffer *v = buffer_slab_peek( |
70315373 | 398 | r->parsed_objects->buffer_slab, commit); |
862e730e | 399 | if (!(v && v->buffer == buffer)) |
152ff1cc JK |
400 | free((void *)buffer); |
401 | } | |
402 | ||
6a7895fd | 403 | void free_commit_buffer(struct parsed_object_pool *pool, struct commit *commit) |
0fb370da | 404 | { |
65ea9d4b | 405 | struct commit_buffer *v = buffer_slab_peek( |
6a7895fd | 406 | pool->buffer_slab, commit); |
862e730e | 407 | if (v) { |
6a83d902 | 408 | FREE_AND_NULL(v->buffer); |
862e730e JH |
409 | v->size = 0; |
410 | } | |
0fb370da JK |
411 | } |
412 | ||
a133c40b NTND |
413 | static inline void set_commit_tree(struct commit *c, struct tree *t) |
414 | { | |
415 | c->maybe_tree = t; | |
416 | } | |
417 | ||
301b8c7f NTND |
418 | struct tree *repo_get_commit_tree(struct repository *r, |
419 | const struct commit *commit) | |
5bb03de1 | 420 | { |
7b8a21db DS |
421 | if (commit->maybe_tree || !commit->object.parsed) |
422 | return commit->maybe_tree; | |
423 | ||
c49c82aa | 424 | if (commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH) |
ea2dab1a | 425 | return get_commit_tree_in_graph(r, commit); |
7b8a21db | 426 | |
83487663 | 427 | return NULL; |
5bb03de1 DS |
428 | } |
429 | ||
430 | struct object_id *get_commit_tree_oid(const struct commit *commit) | |
431 | { | |
ecb5091f | 432 | struct tree *tree = repo_get_commit_tree(the_repository, commit); |
806278de | 433 | return tree ? &tree->object.oid : NULL; |
5bb03de1 DS |
434 | } |
435 | ||
6a7895fd | 436 | void release_commit_memory(struct parsed_object_pool *pool, struct commit *c) |
14ba97f8 | 437 | { |
a133c40b | 438 | set_commit_tree(c, NULL); |
6a7895fd | 439 | free_commit_buffer(pool, c); |
9784f973 | 440 | c->index = 0; |
14ba97f8 | 441 | free_commit_list(c->parents); |
14ba97f8 SB |
442 | |
443 | c->object.parsed = 0; | |
444 | } | |
445 | ||
8597ea3a | 446 | const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep) |
0fb370da | 447 | { |
65ea9d4b SB |
448 | struct commit_buffer *v = buffer_slab_peek( |
449 | the_repository->parsed_objects->buffer_slab, commit); | |
8597ea3a JK |
450 | void *ret; |
451 | ||
862e730e JH |
452 | if (!v) { |
453 | if (sizep) | |
454 | *sizep = 0; | |
455 | return NULL; | |
456 | } | |
8597ea3a JK |
457 | ret = v->buffer; |
458 | if (sizep) | |
459 | *sizep = v->size; | |
460 | ||
461 | v->buffer = NULL; | |
462 | v->size = 0; | |
0fb370da JK |
463 | return ret; |
464 | } | |
465 | ||
fd8030c7 | 466 | int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph) |
175785e5 | 467 | { |
cf7b1cad NTND |
468 | const char *tail = buffer; |
469 | const char *bufptr = buffer; | |
7683e2e6 | 470 | struct object_id parent; |
6c88be16 | 471 | struct commit_list **pptr; |
5da5c8f4 | 472 | struct commit_graft *graft; |
2770ccbd | 473 | const int tree_entry_len = the_hash_algo->hexsz + 5; |
474 | const int parent_entry_len = the_hash_algo->hexsz + 7; | |
12736d2f | 475 | struct tree *tree; |
bd2c39f5 | 476 | |
175785e5 DB |
477 | if (item->object.parsed) |
478 | return 0; | |
bf20fe4c ÆAB |
479 | /* |
480 | * Presumably this is leftover from an earlier failed parse; | |
481 | * clear it out in preparation for us re-parsing (we'll hit the | |
482 | * same error, but that's good, since it lets our caller know | |
483 | * the result cannot be trusted. | |
484 | */ | |
485 | free_commit_list(item->parents); | |
486 | item->parents = NULL; | |
228c78fb | 487 | |
3b44f15a | 488 | tail += size; |
7683e2e6 | 489 | if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || |
490 | bufptr[tree_entry_len] != '\n') | |
f2fd0760 | 491 | return error("bogus commit object %s", oid_to_hex(&item->object.oid)); |
26ea3e7d | 492 | if (get_oid_hex(bufptr + 5, &parent) < 0) |
bd2afde8 | 493 | return error("bad tree pointer in commit %s", |
f2fd0760 | 494 | oid_to_hex(&item->object.oid)); |
12736d2f JK |
495 | tree = lookup_tree(r, &parent); |
496 | if (!tree) | |
497 | return error("bad tree pointer %s in commit %s", | |
498 | oid_to_hex(&parent), | |
499 | oid_to_hex(&item->object.oid)); | |
500 | set_commit_tree(item, tree); | |
7683e2e6 | 501 | bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ |
6c88be16 | 502 | pptr = &item->parents; |
5da5c8f4 | 503 | |
fd8030c7 | 504 | graft = lookup_commit_graft(r, &item->object.oid); |
ce16364e TB |
505 | if (graft) |
506 | r->parsed_objects->substituted_parent = 1; | |
7683e2e6 | 507 | while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { |
f7cc77d7 LT |
508 | struct commit *new_parent; |
509 | ||
7683e2e6 | 510 | if (tail <= bufptr + parent_entry_len + 1 || |
26ea3e7d | 511 | get_oid_hex(bufptr + 7, &parent) || |
7683e2e6 | 512 | bufptr[parent_entry_len] != '\n') |
f2fd0760 | 513 | return error("bad parents in commit %s", oid_to_hex(&item->object.oid)); |
7683e2e6 | 514 | bufptr += parent_entry_len + 1; |
7f3140cd JS |
515 | /* |
516 | * The clone is shallow if nr_parent < 0, and we must | |
517 | * not traverse its real parents even when we unhide them. | |
518 | */ | |
3a5f3087 | 519 | if (graft && (graft->nr_parent < 0 || !grafts_keep_true_parents)) |
5da5c8f4 | 520 | continue; |
fd8030c7 | 521 | new_parent = lookup_commit(r, &parent); |
c78fe004 JK |
522 | if (!new_parent) |
523 | return error("bad parent %s in commit %s", | |
524 | oid_to_hex(&parent), | |
525 | oid_to_hex(&item->object.oid)); | |
526 | pptr = &commit_list_insert(new_parent, pptr)->next; | |
5da5c8f4 JH |
527 | } |
528 | if (graft) { | |
529 | int i; | |
530 | struct commit *new_parent; | |
531 | for (i = 0; i < graft->nr_parent; i++) { | |
fd8030c7 | 532 | new_parent = lookup_commit(r, |
c1f5eb49 | 533 | &graft->parent[i]); |
5da5c8f4 | 534 | if (!new_parent) |
c78fe004 JK |
535 | return error("bad graft parent %s in commit %s", |
536 | oid_to_hex(&graft->parent[i]), | |
537 | oid_to_hex(&item->object.oid)); | |
5da5c8f4 | 538 | pptr = &commit_list_insert(new_parent, pptr)->next; |
5da5c8f4 | 539 | } |
175785e5 | 540 | } |
0a617799 | 541 | item->date = parse_commit_date(bufptr, tail); |
27dedf0c | 542 | |
e2838d85 | 543 | if (check_graph) |
c7944050 | 544 | load_commit_graph_info(r, item); |
e2838d85 | 545 | |
228c78fb | 546 | item->object.parsed = 1; |
175785e5 DB |
547 | return 0; |
548 | } | |
549 | ||
9e5252ab SB |
550 | int repo_parse_commit_internal(struct repository *r, |
551 | struct commit *item, | |
552 | int quiet_on_missing, | |
553 | int use_commit_graph) | |
bd2c39f5 | 554 | { |
21666f1a | 555 | enum object_type type; |
bd2c39f5 NP |
556 | void *buffer; |
557 | unsigned long size; | |
7e2ad1cd JT |
558 | struct object_info oi = { |
559 | .typep = &type, | |
560 | .sizep = &size, | |
561 | .contentp = &buffer, | |
562 | }; | |
563 | /* | |
564 | * Git does not support partial clones that exclude commits, so set | |
565 | * OBJECT_INFO_SKIP_FETCH_OBJECT to fail fast when an object is missing. | |
566 | */ | |
567 | int flags = OBJECT_INFO_LOOKUP_REPLACE | OBJECT_INFO_SKIP_FETCH_OBJECT | | |
568 | OBJECT_INFO_DIE_IF_CORRUPT; | |
bd2c39f5 NP |
569 | int ret; |
570 | ||
9786f68b MK |
571 | if (!item) |
572 | return -1; | |
bd2c39f5 NP |
573 | if (item->object.parsed) |
574 | return 0; | |
7a5d6044 PS |
575 | if (use_commit_graph && parse_commit_in_graph(r, item)) { |
576 | static int commit_graph_paranoia = -1; | |
577 | ||
578 | if (commit_graph_paranoia == -1) | |
b1df3b38 | 579 | commit_graph_paranoia = git_env_bool(GIT_COMMIT_GRAPH_PARANOIA, 0); |
7a5d6044 PS |
580 | |
581 | if (commit_graph_paranoia && !has_object(r, &item->object.oid, 0)) { | |
582 | unparse_commit(r, &item->object.oid); | |
583 | return quiet_on_missing ? -1 : | |
584 | error(_("commit %s exists in commit-graph but not in the object database"), | |
585 | oid_to_hex(&item->object.oid)); | |
586 | } | |
587 | ||
177722b3 | 588 | return 0; |
7a5d6044 | 589 | } |
7e2ad1cd JT |
590 | |
591 | if (oid_object_info_extended(r, &item->object.oid, &oi, flags) < 0) | |
9cc2b07a JK |
592 | return quiet_on_missing ? -1 : |
593 | error("Could not read %s", | |
f2fd0760 | 594 | oid_to_hex(&item->object.oid)); |
21666f1a | 595 | if (type != OBJ_COMMIT) { |
bd2c39f5 NP |
596 | free(buffer); |
597 | return error("Object %s not a commit", | |
f2fd0760 | 598 | oid_to_hex(&item->object.oid)); |
bd2c39f5 | 599 | } |
9b19adac | 600 | |
9e5252ab | 601 | ret = parse_commit_buffer(r, item, buffer, size, 0); |
60ab26de | 602 | if (save_commit_buffer && !ret) { |
9e5252ab | 603 | set_commit_buffer(r, item, buffer, size); |
3ff1fbbb LT |
604 | return 0; |
605 | } | |
bd2c39f5 NP |
606 | free(buffer); |
607 | return ret; | |
608 | } | |
609 | ||
9e5252ab SB |
610 | int repo_parse_commit_gently(struct repository *r, |
611 | struct commit *item, int quiet_on_missing) | |
9b19adac | 612 | { |
9e5252ab | 613 | return repo_parse_commit_internal(r, item, quiet_on_missing, 1); |
9b19adac DS |
614 | } |
615 | ||
7059dccc JK |
616 | void parse_commit_or_die(struct commit *item) |
617 | { | |
ecb5091f | 618 | if (repo_parse_commit(the_repository, item)) |
7059dccc | 619 | die("unable to parse commit %s", |
f2fd0760 | 620 | item ? oid_to_hex(&item->object.oid) : "(null)"); |
7059dccc JK |
621 | } |
622 | ||
11af2aae CC |
623 | int find_commit_subject(const char *commit_buffer, const char **subject) |
624 | { | |
625 | const char *eol; | |
626 | const char *p = commit_buffer; | |
627 | ||
628 | while (*p && (*p != '\n' || p[1] != '\n')) | |
629 | p++; | |
630 | if (*p) { | |
4e1b06da | 631 | p = skip_blank_lines(p + 2); |
9c9b03b1 | 632 | eol = strchrnul(p, '\n'); |
11af2aae CC |
633 | } else |
634 | eol = p; | |
635 | ||
636 | *subject = p; | |
637 | ||
638 | return eol - p; | |
639 | } | |
640 | ||
6e0e2887 CM |
641 | size_t commit_subject_length(const char *body) |
642 | { | |
643 | const char *p = body; | |
644 | while (*p) { | |
645 | const char *next = skip_blank_lines(p); | |
646 | if (next != p) | |
647 | break; | |
648 | p = strchrnul(p, '\n'); | |
649 | if (*p) | |
650 | p++; | |
651 | } | |
652 | return p - body; | |
653 | } | |
654 | ||
ac5155ef | 655 | struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) |
dd97f850 | 656 | { |
812666c8 | 657 | struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); |
dd97f850 DB |
658 | new_list->item = item; |
659 | new_list->next = *list_p; | |
660 | *list_p = new_list; | |
ac5155ef | 661 | return new_list; |
dd97f850 DB |
662 | } |
663 | ||
597b2c39 DS |
664 | int commit_list_contains(struct commit *item, struct commit_list *list) |
665 | { | |
666 | while (list) { | |
667 | if (list->item == item) | |
668 | return 1; | |
669 | list = list->next; | |
670 | } | |
671 | ||
672 | return 0; | |
673 | } | |
674 | ||
65319475 MV |
675 | unsigned commit_list_count(const struct commit_list *l) |
676 | { | |
677 | unsigned c = 0; | |
678 | for (; l; l = l->next ) | |
679 | c++; | |
680 | return c; | |
681 | } | |
682 | ||
53d00b39 TR |
683 | struct commit_list *copy_commit_list(struct commit_list *list) |
684 | { | |
685 | struct commit_list *head = NULL; | |
686 | struct commit_list **pp = &head; | |
687 | while (list) { | |
cb979dbd | 688 | pp = commit_list_append(list->item, pp); |
53d00b39 TR |
689 | list = list->next; |
690 | } | |
691 | return head; | |
692 | } | |
693 | ||
b0ca1205 EN |
694 | struct commit_list *reverse_commit_list(struct commit_list *list) |
695 | { | |
696 | struct commit_list *next = NULL, *current, *backup; | |
697 | for (current = list; current; current = backup) { | |
698 | backup = current->next; | |
699 | current->next = next; | |
700 | next = current; | |
701 | } | |
702 | return next; | |
703 | } | |
704 | ||
175785e5 DB |
705 | void free_commit_list(struct commit_list *list) |
706 | { | |
e510ab89 RS |
707 | while (list) |
708 | pop_commit(&list); | |
175785e5 | 709 | } |
dd97f850 | 710 | |
47e44ed1 | 711 | struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list) |
dd97f850 DB |
712 | { |
713 | struct commit_list **pp = list; | |
714 | struct commit_list *p; | |
715 | while ((p = *pp) != NULL) { | |
716 | if (p->item->date < item->date) { | |
717 | break; | |
718 | } | |
719 | pp = &p->next; | |
720 | } | |
f755494c | 721 | return commit_list_insert(item, pp); |
dd97f850 DB |
722 | } |
723 | ||
c0fb5774 RS |
724 | static int commit_list_compare_by_date(const struct commit_list *a, |
725 | const struct commit_list *b) | |
46905893 | 726 | { |
c0fb5774 RS |
727 | timestamp_t a_date = a->item->date; |
728 | timestamp_t b_date = b->item->date; | |
46905893 RS |
729 | if (a_date < b_date) |
730 | return 1; | |
731 | if (a_date > b_date) | |
732 | return -1; | |
733 | return 0; | |
734 | } | |
735 | ||
c0fb5774 | 736 | DEFINE_LIST_SORT(static, commit_list_sort, struct commit_list, next); |
a6080a0a | 737 | |
47e44ed1 | 738 | void commit_list_sort_by_date(struct commit_list **list) |
dd97f850 | 739 | { |
c0fb5774 | 740 | commit_list_sort(list, commit_list_compare_by_date); |
dd97f850 DB |
741 | } |
742 | ||
58e28af6 DB |
743 | struct commit *pop_most_recent_commit(struct commit_list **list, |
744 | unsigned int mark) | |
dd97f850 | 745 | { |
e510ab89 | 746 | struct commit *ret = pop_commit(list); |
dd97f850 | 747 | struct commit_list *parents = ret->parents; |
dd97f850 DB |
748 | |
749 | while (parents) { | |
4056c091 | 750 | struct commit *commit = parents->item; |
ecb5091f | 751 | if (!repo_parse_commit(the_repository, commit) && !(commit->object.flags & mark)) { |
58e28af6 | 752 | commit->object.flags |= mark; |
47e44ed1 | 753 | commit_list_insert_by_date(commit, list); |
4056c091 | 754 | } |
dd97f850 DB |
755 | parents = parents->next; |
756 | } | |
757 | return ret; | |
758 | } | |
e3bc7a3b | 759 | |
941ba8db NTND |
760 | static void clear_commit_marks_1(struct commit_list **plist, |
761 | struct commit *commit, unsigned int mark) | |
f8f9c73c | 762 | { |
60fcc2e6 JS |
763 | while (commit) { |
764 | struct commit_list *parents; | |
f8f9c73c | 765 | |
60fcc2e6 JS |
766 | if (!(mark & commit->object.flags)) |
767 | return; | |
58ecf5c1 | 768 | |
60fcc2e6 JS |
769 | commit->object.flags &= ~mark; |
770 | ||
771 | parents = commit->parents; | |
772 | if (!parents) | |
773 | return; | |
774 | ||
4cb39fcf RS |
775 | while ((parents = parents->next)) { |
776 | if (parents->item->object.flags & mark) | |
777 | commit_list_insert(parents->item, plist); | |
778 | } | |
60fcc2e6 JS |
779 | |
780 | commit = commit->parents->item; | |
f8f9c73c JH |
781 | } |
782 | } | |
783 | ||
e895cb51 | 784 | void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark) |
941ba8db NTND |
785 | { |
786 | struct commit_list *list = NULL; | |
e895cb51 JH |
787 | |
788 | while (nr--) { | |
07f7d55a | 789 | clear_commit_marks_1(&list, *commit, mark); |
e895cb51 JH |
790 | commit++; |
791 | } | |
941ba8db NTND |
792 | while (list) |
793 | clear_commit_marks_1(&list, pop_commit(&list), mark); | |
794 | } | |
795 | ||
e895cb51 JH |
796 | void clear_commit_marks(struct commit *commit, unsigned int mark) |
797 | { | |
798 | clear_commit_marks_many(1, &commit, mark); | |
799 | } | |
800 | ||
a3437b8c JS |
801 | struct commit *pop_commit(struct commit_list **stack) |
802 | { | |
803 | struct commit_list *top = *stack; | |
804 | struct commit *item = top ? top->item : NULL; | |
805 | ||
806 | if (top) { | |
807 | *stack = top->next; | |
808 | free(top); | |
809 | } | |
810 | return item; | |
811 | } | |
812 | ||
a84b794a JH |
813 | /* |
814 | * Topological sort support | |
815 | */ | |
96c4f4a3 | 816 | |
a84b794a JH |
817 | /* count number of children that have not been emitted */ |
818 | define_commit_slab(indegree_slab, int); | |
96c4f4a3 | 819 | |
18207030 | 820 | define_commit_slab(author_date_slab, timestamp_t); |
81c6b38b | 821 | |
5284fc5c DS |
822 | void record_author_date(struct author_date_slab *author_date, |
823 | struct commit *commit) | |
81c6b38b | 824 | { |
ecb5091f ÆAB |
825 | const char *buffer = repo_get_commit_buffer(the_repository, commit, |
826 | NULL); | |
81c6b38b | 827 | struct ident_split ident; |
ea5517f0 JK |
828 | const char *ident_line; |
829 | size_t ident_len; | |
81c6b38b | 830 | char *date_end; |
dddbad72 | 831 | timestamp_t date; |
81c6b38b | 832 | |
ea5517f0 JK |
833 | ident_line = find_commit_header(buffer, "author", &ident_len); |
834 | if (!ident_line) | |
835 | goto fail_exit; /* no author line */ | |
836 | if (split_ident_line(&ident, ident_line, ident_len) || | |
837 | !ident.date_begin || !ident.date_end) | |
838 | goto fail_exit; /* malformed "author" line */ | |
81c6b38b | 839 | |
1aeb7e75 | 840 | date = parse_timestamp(ident.date_begin, &date_end, 10); |
81c6b38b JH |
841 | if (date_end != ident.date_end) |
842 | goto fail_exit; /* malformed date */ | |
843 | *(author_date_slab_at(author_date, commit)) = date; | |
844 | ||
845 | fail_exit: | |
ecb5091f | 846 | repo_unuse_commit_buffer(the_repository, commit, buffer); |
81c6b38b JH |
847 | } |
848 | ||
5284fc5c DS |
849 | int compare_commits_by_author_date(const void *a_, const void *b_, |
850 | void *cb_data) | |
81c6b38b JH |
851 | { |
852 | const struct commit *a = a_, *b = b_; | |
853 | struct author_date_slab *author_date = cb_data; | |
dddbad72 JS |
854 | timestamp_t a_date = *(author_date_slab_at(author_date, a)); |
855 | timestamp_t b_date = *(author_date_slab_at(author_date, b)); | |
81c6b38b JH |
856 | |
857 | /* newer commits with larger date first */ | |
858 | if (a_date < b_date) | |
859 | return 1; | |
860 | else if (a_date > b_date) | |
861 | return -1; | |
862 | return 0; | |
863 | } | |
864 | ||
17587122 JK |
865 | int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, |
866 | void *unused UNUSED) | |
3afc679b DS |
867 | { |
868 | const struct commit *a = a_, *b = b_; | |
d7f92784 AK |
869 | const timestamp_t generation_a = commit_graph_generation(a), |
870 | generation_b = commit_graph_generation(b); | |
3afc679b DS |
871 | |
872 | /* newer commits first */ | |
c752ad09 | 873 | if (generation_a < generation_b) |
3afc679b | 874 | return 1; |
c752ad09 | 875 | else if (generation_a > generation_b) |
3afc679b DS |
876 | return -1; |
877 | ||
878 | /* use date as a heuristic when generations are equal */ | |
879 | if (a->date < b->date) | |
880 | return 1; | |
881 | else if (a->date > b->date) | |
882 | return -1; | |
883 | return 0; | |
884 | } | |
885 | ||
17587122 JK |
886 | int compare_commits_by_commit_date(const void *a_, const void *b_, |
887 | void *unused UNUSED) | |
da24b104 JH |
888 | { |
889 | const struct commit *a = a_, *b = b_; | |
890 | /* newer commits with larger date first */ | |
891 | if (a->date < b->date) | |
892 | return 1; | |
893 | else if (a->date > b->date) | |
894 | return -1; | |
895 | return 0; | |
896 | } | |
897 | ||
ab580ace JS |
898 | /* |
899 | * Performs an in-place topological sort on the list supplied. | |
900 | */ | |
da24b104 | 901 | void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order) |
6b6dcfc2 | 902 | { |
23c17d4a | 903 | struct commit_list *next, *orig = *list; |
23c17d4a | 904 | struct commit_list **pptr; |
a84b794a | 905 | struct indegree_slab indegree; |
da24b104 JH |
906 | struct prio_queue queue; |
907 | struct commit *commit; | |
81c6b38b | 908 | struct author_date_slab author_date; |
a6080a0a | 909 | |
23c17d4a | 910 | if (!orig) |
7d6fb370 | 911 | return; |
23c17d4a LT |
912 | *list = NULL; |
913 | ||
a84b794a | 914 | init_indegree_slab(&indegree); |
da24b104 | 915 | memset(&queue, '\0', sizeof(queue)); |
81c6b38b | 916 | |
da24b104 JH |
917 | switch (sort_order) { |
918 | default: /* REV_SORT_IN_GRAPH_ORDER */ | |
919 | queue.compare = NULL; | |
920 | break; | |
921 | case REV_SORT_BY_COMMIT_DATE: | |
922 | queue.compare = compare_commits_by_commit_date; | |
923 | break; | |
81c6b38b JH |
924 | case REV_SORT_BY_AUTHOR_DATE: |
925 | init_author_date_slab(&author_date); | |
926 | queue.compare = compare_commits_by_author_date; | |
927 | queue.cb_data = &author_date; | |
928 | break; | |
da24b104 | 929 | } |
96c4f4a3 | 930 | |
23c17d4a LT |
931 | /* Mark them and clear the indegree */ |
932 | for (next = orig; next; next = next->next) { | |
933 | struct commit *commit = next->item; | |
a84b794a | 934 | *(indegree_slab_at(&indegree, commit)) = 1; |
81c6b38b JH |
935 | /* also record the author dates, if needed */ |
936 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) | |
937 | record_author_date(&author_date, commit); | |
ab580ace | 938 | } |
23c17d4a | 939 | |
ab580ace | 940 | /* update the indegree */ |
23c17d4a | 941 | for (next = orig; next; next = next->next) { |
da24b104 | 942 | struct commit_list *parents = next->item->parents; |
ab580ace | 943 | while (parents) { |
23c17d4a | 944 | struct commit *parent = parents->item; |
a84b794a | 945 | int *pi = indegree_slab_at(&indegree, parent); |
6b6dcfc2 | 946 | |
96c4f4a3 JK |
947 | if (*pi) |
948 | (*pi)++; | |
23c17d4a | 949 | parents = parents->next; |
ab580ace | 950 | } |
ab580ace | 951 | } |
23c17d4a | 952 | |
a6080a0a | 953 | /* |
674d1727 PH |
954 | * find the tips |
955 | * | |
956 | * tips are nodes not reachable from any other node in the list | |
957 | * | |
958 | * the tips serve as a starting set for the work queue. | |
959 | */ | |
23c17d4a LT |
960 | for (next = orig; next; next = next->next) { |
961 | struct commit *commit = next->item; | |
ab580ace | 962 | |
a84b794a | 963 | if (*(indegree_slab_at(&indegree, commit)) == 1) |
da24b104 | 964 | prio_queue_put(&queue, commit); |
ab580ace | 965 | } |
4c8725f1 | 966 | |
da24b104 JH |
967 | /* |
968 | * This is unfortunate; the initial tips need to be shown | |
969 | * in the order given from the revision traversal machinery. | |
970 | */ | |
971 | if (sort_order == REV_SORT_IN_GRAPH_ORDER) | |
972 | prio_queue_reverse(&queue); | |
973 | ||
974 | /* We no longer need the commit list */ | |
975 | free_commit_list(orig); | |
23c17d4a LT |
976 | |
977 | pptr = list; | |
978 | *list = NULL; | |
da24b104 JH |
979 | while ((commit = prio_queue_get(&queue)) != NULL) { |
980 | struct commit_list *parents; | |
23c17d4a | 981 | |
23c17d4a | 982 | for (parents = commit->parents; parents ; parents = parents->next) { |
cd2b8ae9 | 983 | struct commit *parent = parents->item; |
a84b794a | 984 | int *pi = indegree_slab_at(&indegree, parent); |
23c17d4a | 985 | |
96c4f4a3 | 986 | if (!*pi) |
23c17d4a LT |
987 | continue; |
988 | ||
989 | /* | |
990 | * parents are only enqueued for emission | |
991 | * when all their children have been emitted thereby | |
992 | * guaranteeing topological order. | |
993 | */ | |
da24b104 JH |
994 | if (--(*pi) == 1) |
995 | prio_queue_put(&queue, parent); | |
ab580ace JS |
996 | } |
997 | /* | |
da24b104 JH |
998 | * all children of commit have already been |
999 | * emitted. we can emit it now. | |
674d1727 | 1000 | */ |
a84b794a | 1001 | *(indegree_slab_at(&indegree, commit)) = 0; |
da24b104 JH |
1002 | |
1003 | pptr = &commit_list_insert(commit, pptr)->next; | |
ab580ace | 1004 | } |
96c4f4a3 | 1005 | |
a84b794a | 1006 | clear_indegree_slab(&indegree); |
da24b104 | 1007 | clear_prio_queue(&queue); |
81c6b38b JH |
1008 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) |
1009 | clear_author_date_slab(&author_date); | |
ab580ace | 1010 | } |
7c6f8aaf | 1011 | |
103148aa PK |
1012 | struct rev_collect { |
1013 | struct commit **commit; | |
1014 | int nr; | |
1015 | int alloc; | |
1016 | unsigned int initial : 1; | |
1017 | }; | |
1018 | ||
1019 | static void add_one_commit(struct object_id *oid, struct rev_collect *revs) | |
1020 | { | |
1021 | struct commit *commit; | |
1022 | ||
1023 | if (is_null_oid(oid)) | |
1024 | return; | |
1025 | ||
1026 | commit = lookup_commit(the_repository, oid); | |
1027 | if (!commit || | |
1028 | (commit->object.flags & TMP_MARK) || | |
ecb5091f | 1029 | repo_parse_commit(the_repository, commit)) |
103148aa PK |
1030 | return; |
1031 | ||
1032 | ALLOC_GROW(revs->commit, revs->nr + 1, revs->alloc); | |
1033 | revs->commit[revs->nr++] = commit; | |
1034 | commit->object.flags |= TMP_MARK; | |
1035 | } | |
1036 | ||
1037 | static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid, | |
5cf88fd8 ÆAB |
1038 | const char *ident UNUSED, |
1039 | timestamp_t timestamp UNUSED, int tz UNUSED, | |
1040 | const char *message UNUSED, void *cbdata) | |
103148aa PK |
1041 | { |
1042 | struct rev_collect *revs = cbdata; | |
1043 | ||
1044 | if (revs->initial) { | |
1045 | revs->initial = 0; | |
1046 | add_one_commit(ooid, revs); | |
1047 | } | |
1048 | add_one_commit(noid, revs); | |
1049 | return 0; | |
1050 | } | |
1051 | ||
1052 | struct commit *get_fork_point(const char *refname, struct commit *commit) | |
1053 | { | |
1054 | struct object_id oid; | |
1055 | struct rev_collect revs; | |
53173805 | 1056 | struct commit_list *bases = NULL; |
103148aa PK |
1057 | int i; |
1058 | struct commit *ret = NULL; | |
f08132f8 JH |
1059 | char *full_refname; |
1060 | ||
12cb1c10 ÆAB |
1061 | switch (repo_dwim_ref(the_repository, refname, strlen(refname), &oid, |
1062 | &full_refname, 0)) { | |
f08132f8 JH |
1063 | case 0: |
1064 | die("No such ref: '%s'", refname); | |
1065 | case 1: | |
1066 | break; /* good */ | |
1067 | default: | |
1068 | die("Ambiguous refname: '%s'", refname); | |
1069 | } | |
103148aa PK |
1070 | |
1071 | memset(&revs, 0, sizeof(revs)); | |
1072 | revs.initial = 1; | |
f08132f8 | 1073 | for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs); |
103148aa | 1074 | |
f08132f8 | 1075 | if (!revs.nr) |
103148aa PK |
1076 | add_one_commit(&oid, &revs); |
1077 | ||
1078 | for (i = 0; i < revs.nr; i++) | |
1079 | revs.commit[i]->object.flags &= ~TMP_MARK; | |
1080 | ||
53173805 JS |
1081 | if (repo_get_merge_bases_many(the_repository, commit, revs.nr, |
1082 | revs.commit, &bases) < 0) | |
1083 | exit(128); | |
103148aa PK |
1084 | |
1085 | /* | |
1086 | * There should be one and only one merge base, when we found | |
1087 | * a common ancestor among reflog entries. | |
1088 | */ | |
1089 | if (!bases || bases->next) | |
1090 | goto cleanup_return; | |
1091 | ||
1092 | /* And the found one must be one of the reflog entries */ | |
1093 | for (i = 0; i < revs.nr; i++) | |
1094 | if (&bases->item->object == &revs.commit[i]->object) | |
1095 | break; /* found */ | |
1096 | if (revs.nr <= i) | |
1097 | goto cleanup_return; | |
1098 | ||
1099 | ret = bases->item; | |
1100 | ||
1101 | cleanup_return: | |
0c10ed19 | 1102 | free(revs.commit); |
103148aa | 1103 | free_commit_list(bases); |
f08132f8 | 1104 | free(full_refname); |
103148aa PK |
1105 | return ret; |
1106 | } | |
1107 | ||
42d4e1d1 | 1108 | /* |
1109 | * Indexed by hash algorithm identifier. | |
1110 | */ | |
1111 | static const char *gpg_sig_headers[] = { | |
1112 | NULL, | |
1113 | "gpgsig", | |
1114 | "gpgsig-sha256", | |
1115 | }; | |
ba3c69a9 | 1116 | |
6bcc5fa2 | 1117 | int add_header_signature(struct strbuf *buf, struct strbuf *sig, const struct git_hash_algo *algo) |
ba3c69a9 | 1118 | { |
ba3c69a9 | 1119 | int inspos, copypos; |
3324dd8f | 1120 | const char *eoh; |
6206089c | 1121 | const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(algo)]; |
42d4e1d1 | 1122 | int gpg_sig_header_len = strlen(gpg_sig_header); |
ba3c69a9 JH |
1123 | |
1124 | /* find the end of the header */ | |
3324dd8f JS |
1125 | eoh = strstr(buf->buf, "\n\n"); |
1126 | if (!eoh) | |
1127 | inspos = buf->len; | |
1128 | else | |
1129 | inspos = eoh - buf->buf + 1; | |
ba3c69a9 | 1130 | |
6206089c | 1131 | for (copypos = 0; sig->buf[copypos]; ) { |
1132 | const char *bol = sig->buf + copypos; | |
ba3c69a9 JH |
1133 | const char *eol = strchrnul(bol, '\n'); |
1134 | int len = (eol - bol) + !!*eol; | |
1135 | ||
1136 | if (!copypos) { | |
1137 | strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len); | |
1138 | inspos += gpg_sig_header_len; | |
1139 | } | |
a91cc7fa | 1140 | strbuf_insertstr(buf, inspos++, " "); |
ba3c69a9 JH |
1141 | strbuf_insert(buf, inspos, bol, len); |
1142 | inspos += len; | |
1143 | copypos += len; | |
1144 | } | |
ba3c69a9 JH |
1145 | return 0; |
1146 | } | |
1147 | ||
6206089c | 1148 | static int sign_commit_to_strbuf(struct strbuf *sig, struct strbuf *buf, const char *keyid) |
1149 | { | |
1150 | if (!keyid || !*keyid) | |
1151 | keyid = get_signing_key(); | |
1152 | if (sign_buffer(buf, sig, keyid)) | |
1153 | return -1; | |
1154 | return 0; | |
1155 | } | |
937032e1 | 1156 | |
218aa3a6 | 1157 | int parse_signed_commit(const struct commit *commit, |
1fb5cf0d | 1158 | struct strbuf *payload, struct strbuf *signature, |
1159 | const struct git_hash_algo *algop) | |
0c37f1fc JH |
1160 | { |
1161 | unsigned long size; | |
ecb5091f ÆAB |
1162 | const char *buffer = repo_get_commit_buffer(the_repository, commit, |
1163 | &size); | |
937032e1 | 1164 | int ret = parse_buffer_signed_by_header(buffer, size, payload, signature, algop); |
1165 | ||
ecb5091f | 1166 | repo_unuse_commit_buffer(the_repository, commit, buffer); |
937032e1 | 1167 | return ret; |
1168 | } | |
1169 | ||
1170 | int parse_buffer_signed_by_header(const char *buffer, | |
1171 | unsigned long size, | |
1172 | struct strbuf *payload, | |
1173 | struct strbuf *signature, | |
1174 | const struct git_hash_algo *algop) | |
1175 | { | |
1fb5cf0d | 1176 | int in_signature = 0, saw_signature = 0, other_signature = 0; |
1177 | const char *line, *tail, *p; | |
1178 | const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(algop)]; | |
0c37f1fc JH |
1179 | |
1180 | line = buffer; | |
1181 | tail = buffer + size; | |
0c37f1fc JH |
1182 | while (line < tail) { |
1183 | const char *sig = NULL; | |
218aa3a6 | 1184 | const char *next = memchr(line, '\n', tail - line); |
0c37f1fc JH |
1185 | |
1186 | next = next ? next + 1 : tail; | |
1187 | if (in_signature && line[0] == ' ') | |
1188 | sig = line + 1; | |
1fb5cf0d | 1189 | else if (skip_prefix(line, gpg_sig_header, &p) && |
1190 | *p == ' ') { | |
1191 | sig = line + strlen(gpg_sig_header) + 1; | |
1192 | other_signature = 0; | |
1193 | } | |
1194 | else if (starts_with(line, "gpgsig")) | |
1195 | other_signature = 1; | |
1196 | else if (other_signature && line[0] != ' ') | |
1197 | other_signature = 0; | |
0c37f1fc JH |
1198 | if (sig) { |
1199 | strbuf_add(signature, sig, next - sig); | |
1200 | saw_signature = 1; | |
1201 | in_signature = 1; | |
1202 | } else { | |
1203 | if (*line == '\n') | |
1204 | /* dump the whole remainder of the buffer */ | |
1205 | next = tail; | |
1fb5cf0d | 1206 | if (!other_signature) |
1207 | strbuf_add(payload, line, next - line); | |
0c37f1fc JH |
1208 | in_signature = 0; |
1209 | } | |
1210 | line = next; | |
1211 | } | |
0c37f1fc JH |
1212 | return saw_signature; |
1213 | } | |
1214 | ||
0b05ab6f CC |
1215 | int remove_signature(struct strbuf *buf) |
1216 | { | |
1217 | const char *line = buf->buf; | |
1218 | const char *tail = buf->buf + buf->len; | |
1219 | int in_signature = 0; | |
1fb5cf0d | 1220 | struct sigbuf { |
1221 | const char *start; | |
1222 | const char *end; | |
1223 | } sigs[2], *sigp = &sigs[0]; | |
1224 | int i; | |
1225 | const char *orig_buf = buf->buf; | |
1226 | ||
1227 | memset(sigs, 0, sizeof(sigs)); | |
0b05ab6f CC |
1228 | |
1229 | while (line < tail) { | |
1230 | const char *next = memchr(line, '\n', tail - line); | |
1231 | next = next ? next + 1 : tail; | |
1232 | ||
1233 | if (in_signature && line[0] == ' ') | |
1fb5cf0d | 1234 | sigp->end = next; |
42d4e1d1 | 1235 | else if (starts_with(line, "gpgsig")) { |
1236 | int i; | |
1237 | for (i = 1; i < GIT_HASH_NALGOS; i++) { | |
1238 | const char *p; | |
1239 | if (skip_prefix(line, gpg_sig_headers[i], &p) && | |
1240 | *p == ' ') { | |
1fb5cf0d | 1241 | sigp->start = line; |
1242 | sigp->end = next; | |
42d4e1d1 | 1243 | in_signature = 1; |
1244 | } | |
1245 | } | |
0b05ab6f CC |
1246 | } else { |
1247 | if (*line == '\n') | |
1248 | /* dump the whole remainder of the buffer */ | |
1249 | next = tail; | |
1fb5cf0d | 1250 | if (in_signature && sigp - sigs != ARRAY_SIZE(sigs)) |
1251 | sigp++; | |
0b05ab6f CC |
1252 | in_signature = 0; |
1253 | } | |
1254 | line = next; | |
1255 | } | |
1256 | ||
1fb5cf0d | 1257 | for (i = ARRAY_SIZE(sigs) - 1; i >= 0; i--) |
1258 | if (sigs[i].start) | |
1259 | strbuf_remove(buf, sigs[i].start - orig_buf, sigs[i].end - sigs[i].start); | |
0b05ab6f | 1260 | |
1fb5cf0d | 1261 | return sigs[0].start != NULL; |
0b05ab6f CC |
1262 | } |
1263 | ||
5231c633 JH |
1264 | static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail) |
1265 | { | |
1266 | struct merge_remote_desc *desc; | |
1267 | struct commit_extra_header *mergetag; | |
1268 | char *buf; | |
482c1191 | 1269 | unsigned long size; |
5231c633 | 1270 | enum object_type type; |
482c1191 | 1271 | struct strbuf payload = STRBUF_INIT; |
1272 | struct strbuf signature = STRBUF_INIT; | |
5231c633 JH |
1273 | |
1274 | desc = merge_remote_util(parent); | |
1275 | if (!desc || !desc->obj) | |
1276 | return; | |
bc726bd0 ÆAB |
1277 | buf = repo_read_object_file(the_repository, &desc->obj->oid, &type, |
1278 | &size); | |
5231c633 JH |
1279 | if (!buf || type != OBJ_TAG) |
1280 | goto free_return; | |
482c1191 | 1281 | if (!parse_signature(buf, size, &payload, &signature)) |
5231c633 JH |
1282 | goto free_return; |
1283 | /* | |
1284 | * We could verify this signature and either omit the tag when | |
1285 | * it does not validate, but the integrator may not have the | |
0e20b229 | 1286 | * public key of the signer of the tag being merged, while a |
5231c633 JH |
1287 | * later auditor may have it while auditing, so let's not run |
1288 | * verify-signed-buffer here for now... | |
1289 | * | |
1290 | * if (verify_signed_buffer(buf, len, buf + len, size - len, ...)) | |
1291 | * warn("warning: signed tag unverified."); | |
1292 | */ | |
ca56dadb | 1293 | CALLOC_ARRAY(mergetag, 1); |
5231c633 JH |
1294 | mergetag->key = xstrdup("mergetag"); |
1295 | mergetag->value = buf; | |
1296 | mergetag->len = size; | |
1297 | ||
1298 | **tail = mergetag; | |
1299 | *tail = &mergetag->next; | |
482c1191 | 1300 | strbuf_release(&payload); |
1301 | strbuf_release(&signature); | |
5231c633 JH |
1302 | return; |
1303 | ||
1304 | free_return: | |
1305 | free(buf); | |
1306 | } | |
1307 | ||
434060ec | 1308 | int check_commit_signature(const struct commit *commit, struct signature_check *sigc) |
ffb6d7d5 SG |
1309 | { |
1310 | struct strbuf payload = STRBUF_INIT; | |
1311 | struct strbuf signature = STRBUF_INIT; | |
434060ec | 1312 | int ret = 1; |
ffb6d7d5 SG |
1313 | |
1314 | sigc->result = 'N'; | |
1315 | ||
1fb5cf0d | 1316 | if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0) |
ffb6d7d5 | 1317 | goto out; |
02769437 | 1318 | |
6393c956 | 1319 | sigc->payload_type = SIGNATURE_PAYLOAD_COMMIT; |
02769437 FS |
1320 | sigc->payload = strbuf_detach(&payload, &sigc->payload_len); |
1321 | ret = check_signature(sigc, signature.buf, signature.len); | |
ffb6d7d5 SG |
1322 | |
1323 | out: | |
ffb6d7d5 SG |
1324 | strbuf_release(&payload); |
1325 | strbuf_release(&signature); | |
434060ec | 1326 | |
1327 | return ret; | |
ffb6d7d5 SG |
1328 | } |
1329 | ||
54887b46 HJI |
1330 | void verify_merge_signature(struct commit *commit, int verbosity, |
1331 | int check_trust) | |
edc4d47d JK |
1332 | { |
1333 | char hex[GIT_MAX_HEXSZ + 1]; | |
1334 | struct signature_check signature_check; | |
54887b46 | 1335 | int ret; |
edc4d47d JK |
1336 | memset(&signature_check, 0, sizeof(signature_check)); |
1337 | ||
54887b46 | 1338 | ret = check_commit_signature(commit, &signature_check); |
edc4d47d | 1339 | |
d850b7a5 ÆAB |
1340 | repo_find_unique_abbrev_r(the_repository, hex, &commit->object.oid, |
1341 | DEFAULT_ABBREV); | |
edc4d47d JK |
1342 | switch (signature_check.result) { |
1343 | case 'G': | |
54887b46 HJI |
1344 | if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL)) |
1345 | die(_("Commit %s has an untrusted GPG signature, " | |
1346 | "allegedly by %s."), hex, signature_check.signer); | |
edc4d47d | 1347 | break; |
edc4d47d JK |
1348 | case 'B': |
1349 | die(_("Commit %s has a bad GPG signature " | |
1350 | "allegedly by %s."), hex, signature_check.signer); | |
1351 | default: /* 'N' */ | |
1352 | die(_("Commit %s does not have a GPG signature."), hex); | |
1353 | } | |
1354 | if (verbosity >= 0 && signature_check.result == 'G') | |
1355 | printf(_("Commit %s has a good GPG signature by %s\n"), | |
1356 | hex, signature_check.signer); | |
ffb6d7d5 | 1357 | |
edc4d47d JK |
1358 | signature_check_clear(&signature_check); |
1359 | } | |
ffb6d7d5 | 1360 | |
5231c633 JH |
1361 | void append_merge_tag_headers(struct commit_list *parents, |
1362 | struct commit_extra_header ***tail) | |
1363 | { | |
1364 | while (parents) { | |
1365 | struct commit *parent = parents->item; | |
1366 | handle_signed_tag(parent, tail); | |
1367 | parents = parents->next; | |
1368 | } | |
1369 | } | |
1370 | ||
a3e8ae54 EB |
1371 | static int convert_commit_extra_headers(struct commit_extra_header *orig, |
1372 | struct commit_extra_header **result) | |
1373 | { | |
1374 | const struct git_hash_algo *compat = the_repository->compat_hash_algo; | |
1375 | const struct git_hash_algo *algo = the_repository->hash_algo; | |
1376 | struct commit_extra_header *extra = NULL, **tail = &extra; | |
1377 | struct strbuf out = STRBUF_INIT; | |
1378 | while (orig) { | |
1379 | struct commit_extra_header *new; | |
1380 | CALLOC_ARRAY(new, 1); | |
1381 | if (!strcmp(orig->key, "mergetag")) { | |
1382 | if (convert_object_file(&out, algo, compat, | |
1383 | orig->value, orig->len, | |
1384 | OBJ_TAG, 1)) { | |
1385 | free(new); | |
1386 | free_commit_extra_headers(extra); | |
1387 | return -1; | |
1388 | } | |
1389 | new->key = xstrdup("mergetag"); | |
1390 | new->value = strbuf_detach(&out, &new->len); | |
1391 | } else { | |
1392 | new->key = xstrdup(orig->key); | |
1393 | new->len = orig->len; | |
1394 | new->value = xmemdupz(orig->value, orig->len); | |
1395 | } | |
1396 | *tail = new; | |
1397 | tail = &new->next; | |
1398 | orig = orig->next; | |
1399 | } | |
1400 | *result = extra; | |
1401 | return 0; | |
1402 | } | |
1403 | ||
5231c633 JH |
1404 | static void add_extra_header(struct strbuf *buffer, |
1405 | struct commit_extra_header *extra) | |
1406 | { | |
1407 | strbuf_addstr(buffer, extra->key); | |
ed7a42a0 JH |
1408 | if (extra->len) |
1409 | strbuf_add_lines(buffer, " ", extra->value, extra->len); | |
1410 | else | |
1411 | strbuf_addch(buffer, '\n'); | |
1412 | } | |
1413 | ||
c871a1d1 JH |
1414 | struct commit_extra_header *read_commit_extra_headers(struct commit *commit, |
1415 | const char **exclude) | |
ed7a42a0 JH |
1416 | { |
1417 | struct commit_extra_header *extra = NULL; | |
1418 | unsigned long size; | |
ecb5091f ÆAB |
1419 | const char *buffer = repo_get_commit_buffer(the_repository, commit, |
1420 | &size); | |
218aa3a6 | 1421 | extra = read_commit_extra_header_lines(buffer, size, exclude); |
ecb5091f | 1422 | repo_unuse_commit_buffer(the_repository, commit, buffer); |
ed7a42a0 JH |
1423 | return extra; |
1424 | } | |
1425 | ||
fef461ea | 1426 | int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data) |
063da62b CC |
1427 | { |
1428 | struct commit_extra_header *extra, *to_free; | |
fef461ea | 1429 | int res = 0; |
063da62b CC |
1430 | |
1431 | to_free = read_commit_extra_headers(commit, NULL); | |
fef461ea | 1432 | for (extra = to_free; !res && extra; extra = extra->next) { |
063da62b CC |
1433 | if (strcmp(extra->key, "mergetag")) |
1434 | continue; /* not a merge tag */ | |
fef461ea | 1435 | res = fn(commit, extra, data); |
063da62b CC |
1436 | } |
1437 | free_commit_extra_headers(to_free); | |
fef461ea | 1438 | return res; |
063da62b CC |
1439 | } |
1440 | ||
ed7a42a0 JH |
1441 | static inline int standard_header_field(const char *field, size_t len) |
1442 | { | |
b072504c RS |
1443 | return ((len == 4 && !memcmp(field, "tree", 4)) || |
1444 | (len == 6 && !memcmp(field, "parent", 6)) || | |
1445 | (len == 6 && !memcmp(field, "author", 6)) || | |
1446 | (len == 9 && !memcmp(field, "committer", 9)) || | |
1447 | (len == 8 && !memcmp(field, "encoding", 8))); | |
ed7a42a0 JH |
1448 | } |
1449 | ||
c871a1d1 JH |
1450 | static int excluded_header_field(const char *field, size_t len, const char **exclude) |
1451 | { | |
1452 | if (!exclude) | |
1453 | return 0; | |
1454 | ||
1455 | while (*exclude) { | |
1456 | size_t xlen = strlen(*exclude); | |
b072504c | 1457 | if (len == xlen && !memcmp(field, *exclude, xlen)) |
c871a1d1 JH |
1458 | return 1; |
1459 | exclude++; | |
1460 | } | |
1461 | return 0; | |
1462 | } | |
1463 | ||
82a75299 JH |
1464 | static struct commit_extra_header *read_commit_extra_header_lines( |
1465 | const char *buffer, size_t size, | |
1466 | const char **exclude) | |
ed7a42a0 JH |
1467 | { |
1468 | struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL; | |
1469 | const char *line, *next, *eof, *eob; | |
1470 | struct strbuf buf = STRBUF_INIT; | |
1471 | ||
1472 | for (line = buffer, eob = line + size; | |
1473 | line < eob && *line != '\n'; | |
1474 | line = next) { | |
1475 | next = memchr(line, '\n', eob - line); | |
1476 | next = next ? next + 1 : eob; | |
1477 | if (*line == ' ') { | |
1478 | /* continuation */ | |
1479 | if (it) | |
1480 | strbuf_add(&buf, line + 1, next - (line + 1)); | |
1481 | continue; | |
1482 | } | |
1483 | if (it) | |
1484 | it->value = strbuf_detach(&buf, &it->len); | |
1485 | strbuf_reset(&buf); | |
1486 | it = NULL; | |
1487 | ||
50a01cc4 RS |
1488 | eof = memchr(line, ' ', next - line); |
1489 | if (!eof) | |
ed7a42a0 | 1490 | eof = next; |
b072504c RS |
1491 | else if (standard_header_field(line, eof - line) || |
1492 | excluded_header_field(line, eof - line, exclude)) | |
ed7a42a0 JH |
1493 | continue; |
1494 | ||
ca56dadb | 1495 | CALLOC_ARRAY(it, 1); |
ed7a42a0 JH |
1496 | it->key = xmemdupz(line, eof-line); |
1497 | *tail = it; | |
1498 | tail = &it->next; | |
1499 | if (eof + 1 < next) | |
1500 | strbuf_add(&buf, eof + 1, next - (eof + 1)); | |
1501 | } | |
1502 | if (it) | |
1503 | it->value = strbuf_detach(&buf, &it->len); | |
1504 | return extra; | |
5231c633 JH |
1505 | } |
1506 | ||
1507 | void free_commit_extra_headers(struct commit_extra_header *extra) | |
1508 | { | |
1509 | while (extra) { | |
1510 | struct commit_extra_header *next = extra->next; | |
1511 | free(extra->key); | |
1512 | free(extra->value); | |
1513 | free(extra); | |
1514 | extra = next; | |
1515 | } | |
1516 | } | |
1517 | ||
5078f344 PO |
1518 | int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree, |
1519 | struct commit_list *parents, struct object_id *ret, | |
ba3c69a9 | 1520 | const char *author, const char *sign_commit) |
5231c633 JH |
1521 | { |
1522 | struct commit_extra_header *extra = NULL, **tail = &extra; | |
1523 | int result; | |
1524 | ||
1525 | append_merge_tag_headers(parents, &tail); | |
e8cbe211 PW |
1526 | result = commit_tree_extended(msg, msg_len, tree, parents, ret, author, |
1527 | NULL, sign_commit, extra); | |
5231c633 JH |
1528 | free_commit_extra_headers(extra); |
1529 | return result; | |
1530 | } | |
1531 | ||
08a94a14 LT |
1532 | static int find_invalid_utf8(const char *buf, int len) |
1533 | { | |
1534 | int offset = 0; | |
e82bd6cc | 1535 | static const unsigned int max_codepoint[] = { |
1536 | 0x7f, 0x7ff, 0xffff, 0x10ffff | |
1537 | }; | |
08a94a14 LT |
1538 | |
1539 | while (len) { | |
1540 | unsigned char c = *buf++; | |
1541 | int bytes, bad_offset; | |
28110d4b | 1542 | unsigned int codepoint; |
e82bd6cc | 1543 | unsigned int min_val, max_val; |
08a94a14 LT |
1544 | |
1545 | len--; | |
1546 | offset++; | |
1547 | ||
1548 | /* Simple US-ASCII? No worries. */ | |
1549 | if (c < 0x80) | |
1550 | continue; | |
1551 | ||
1552 | bad_offset = offset-1; | |
1553 | ||
1554 | /* | |
1555 | * Count how many more high bits set: that's how | |
1556 | * many more bytes this sequence should have. | |
1557 | */ | |
1558 | bytes = 0; | |
1559 | while (c & 0x40) { | |
1560 | c <<= 1; | |
1561 | bytes++; | |
1562 | } | |
1563 | ||
28110d4b | 1564 | /* |
1565 | * Must be between 1 and 3 more bytes. Longer sequences result in | |
1566 | * codepoints beyond U+10FFFF, which are guaranteed never to exist. | |
1567 | */ | |
1568 | if (bytes < 1 || 3 < bytes) | |
08a94a14 LT |
1569 | return bad_offset; |
1570 | ||
1571 | /* Do we *have* that many bytes? */ | |
1572 | if (len < bytes) | |
1573 | return bad_offset; | |
1574 | ||
e82bd6cc | 1575 | /* |
1576 | * Place the encoded bits at the bottom of the value and compute the | |
1577 | * valid range. | |
1578 | */ | |
28110d4b | 1579 | codepoint = (c & 0x7f) >> bytes; |
e82bd6cc | 1580 | min_val = max_codepoint[bytes-1] + 1; |
1581 | max_val = max_codepoint[bytes]; | |
28110d4b | 1582 | |
08a94a14 LT |
1583 | offset += bytes; |
1584 | len -= bytes; | |
1585 | ||
1586 | /* And verify that they are good continuation bytes */ | |
1587 | do { | |
28110d4b | 1588 | codepoint <<= 6; |
1589 | codepoint |= *buf & 0x3f; | |
08a94a14 LT |
1590 | if ((*buf++ & 0xc0) != 0x80) |
1591 | return bad_offset; | |
1592 | } while (--bytes); | |
1593 | ||
e82bd6cc | 1594 | /* Reject codepoints that are out of range for the sequence length. */ |
1595 | if (codepoint < min_val || codepoint > max_val) | |
28110d4b | 1596 | return bad_offset; |
1597 | /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */ | |
1598 | if ((codepoint & 0x1ff800) == 0xd800) | |
1599 | return bad_offset; | |
81050ac6 | 1600 | /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */ |
dc773a67 | 1601 | if ((codepoint & 0xfffe) == 0xfffe) |
81050ac6 PK |
1602 | return bad_offset; |
1603 | /* So are anything in the range U+FDD0..U+FDEF. */ | |
1604 | if (codepoint >= 0xfdd0 && codepoint <= 0xfdef) | |
28110d4b | 1605 | return bad_offset; |
08a94a14 LT |
1606 | } |
1607 | return -1; | |
1608 | } | |
1609 | ||
1610 | /* | |
1611 | * This verifies that the buffer is in proper utf8 format. | |
1612 | * | |
1613 | * If it isn't, it assumes any non-utf8 characters are Latin1, | |
1614 | * and does the conversion. | |
08a94a14 LT |
1615 | */ |
1616 | static int verify_utf8(struct strbuf *buf) | |
1617 | { | |
1618 | int ok = 1; | |
1619 | long pos = 0; | |
1620 | ||
1621 | for (;;) { | |
1622 | int bad; | |
1623 | unsigned char c; | |
1624 | unsigned char replace[2]; | |
1625 | ||
1626 | bad = find_invalid_utf8(buf->buf + pos, buf->len - pos); | |
1627 | if (bad < 0) | |
1628 | return ok; | |
1629 | pos += bad; | |
1630 | ok = 0; | |
1631 | c = buf->buf[pos]; | |
1632 | strbuf_remove(buf, pos, 1); | |
1633 | ||
1634 | /* We know 'c' must be in the range 128-255 */ | |
1635 | replace[0] = 0xc0 + (c >> 6); | |
1636 | replace[1] = 0x80 + (c & 0x3f); | |
1637 | strbuf_insert(buf, pos, replace, 2); | |
1638 | pos += 2; | |
1639 | } | |
1640 | } | |
1641 | ||
40d52ff7 | 1642 | static const char commit_utf8_warn[] = |
4fa4b315 VA |
1643 | N_("Warning: commit message did not conform to UTF-8.\n" |
1644 | "You may want to amend it after fixing the message, or set the config\n" | |
b4eda05d | 1645 | "variable i18n.commitEncoding to the encoding your project uses.\n"); |
40d52ff7 | 1646 | |
6206089c | 1647 | static void write_commit_tree(struct strbuf *buffer, const char *msg, size_t msg_len, |
1648 | const struct object_id *tree, | |
1649 | const struct object_id *parents, size_t parents_len, | |
1650 | const char *author, const char *committer, | |
1651 | struct commit_extra_header *extra) | |
40d52ff7 | 1652 | { |
40d52ff7 | 1653 | int encoding_is_utf8; |
6206089c | 1654 | size_t i; |
37576c14 | 1655 | |
40d52ff7 JK |
1656 | /* Not having i18n.commitencoding is the same as having utf-8 */ |
1657 | encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); | |
1658 | ||
6206089c | 1659 | strbuf_grow(buffer, 8192); /* should avoid reallocs for the headers */ |
1660 | strbuf_addf(buffer, "tree %s\n", oid_to_hex(tree)); | |
40d52ff7 JK |
1661 | |
1662 | /* | |
1663 | * NOTE! This ordering means that the same exact tree merged with a | |
1664 | * different order of parents will be a _different_ changeset even | |
1665 | * if everything else stays the same. | |
1666 | */ | |
6206089c | 1667 | for (i = 0; i < parents_len; i++) |
1668 | strbuf_addf(buffer, "parent %s\n", oid_to_hex(&parents[i])); | |
40d52ff7 JK |
1669 | |
1670 | /* Person/date information */ | |
1671 | if (!author) | |
f9bc573f | 1672 | author = git_author_info(IDENT_STRICT); |
6206089c | 1673 | strbuf_addf(buffer, "author %s\n", author); |
e8cbe211 PW |
1674 | if (!committer) |
1675 | committer = git_committer_info(IDENT_STRICT); | |
6206089c | 1676 | strbuf_addf(buffer, "committer %s\n", committer); |
40d52ff7 | 1677 | if (!encoding_is_utf8) |
6206089c | 1678 | strbuf_addf(buffer, "encoding %s\n", git_commit_encoding); |
5231c633 JH |
1679 | |
1680 | while (extra) { | |
6206089c | 1681 | add_extra_header(buffer, extra); |
5231c633 JH |
1682 | extra = extra->next; |
1683 | } | |
6206089c | 1684 | strbuf_addch(buffer, '\n'); |
40d52ff7 JK |
1685 | |
1686 | /* And add the comment */ | |
6206089c | 1687 | strbuf_add(buffer, msg, msg_len); |
1688 | } | |
40d52ff7 | 1689 | |
6206089c | 1690 | int commit_tree_extended(const char *msg, size_t msg_len, |
1691 | const struct object_id *tree, | |
1692 | struct commit_list *parents, struct object_id *ret, | |
1693 | const char *author, const char *committer, | |
1694 | const char *sign_commit, | |
1695 | struct commit_extra_header *extra) | |
1696 | { | |
1697 | struct repository *r = the_repository; | |
1698 | int result = 0; | |
1699 | int encoding_is_utf8; | |
1700 | struct strbuf buffer = STRBUF_INIT, compat_buffer = STRBUF_INIT; | |
1701 | struct strbuf sig = STRBUF_INIT, compat_sig = STRBUF_INIT; | |
1702 | struct object_id *parent_buf = NULL, *compat_oid = NULL; | |
1703 | struct object_id compat_oid_buf; | |
1704 | size_t i, nparents; | |
1705 | ||
1706 | /* Not having i18n.commitencoding is the same as having utf-8 */ | |
1707 | encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); | |
1708 | ||
1709 | assert_oid_type(tree, OBJ_TREE); | |
40d52ff7 | 1710 | |
6206089c | 1711 | if (memchr(msg, '\0', msg_len)) |
1712 | return error("a NUL byte in commit log message not allowed."); | |
40d52ff7 | 1713 | |
6206089c | 1714 | nparents = commit_list_count(parents); |
1715 | CALLOC_ARRAY(parent_buf, nparents); | |
1716 | i = 0; | |
1717 | while (parents) { | |
1718 | struct commit *parent = pop_commit(&parents); | |
1719 | oidcpy(&parent_buf[i++], &parent->object.oid); | |
1720 | } | |
1721 | ||
1722 | write_commit_tree(&buffer, msg, msg_len, tree, parent_buf, nparents, author, committer, extra); | |
1723 | if (sign_commit && sign_commit_to_strbuf(&sig, &buffer, sign_commit)) { | |
e505146d RS |
1724 | result = -1; |
1725 | goto out; | |
1726 | } | |
6206089c | 1727 | if (r->compat_hash_algo) { |
a3e8ae54 | 1728 | struct commit_extra_header *compat_extra = NULL; |
6206089c | 1729 | struct object_id mapped_tree; |
1730 | struct object_id *mapped_parents; | |
1731 | ||
1732 | CALLOC_ARRAY(mapped_parents, nparents); | |
ba3c69a9 | 1733 | |
6206089c | 1734 | if (repo_oid_to_algop(r, tree, r->compat_hash_algo, &mapped_tree)) { |
1735 | result = -1; | |
1736 | free(mapped_parents); | |
1737 | goto out; | |
1738 | } | |
1739 | for (i = 0; i < nparents; i++) | |
1740 | if (repo_oid_to_algop(r, &parent_buf[i], r->compat_hash_algo, &mapped_parents[i])) { | |
1741 | result = -1; | |
1742 | free(mapped_parents); | |
1743 | goto out; | |
1744 | } | |
a3e8ae54 EB |
1745 | if (convert_commit_extra_headers(extra, &compat_extra)) { |
1746 | result = -1; | |
1747 | free(mapped_parents); | |
1748 | goto out; | |
1749 | } | |
6206089c | 1750 | write_commit_tree(&compat_buffer, msg, msg_len, &mapped_tree, |
a3e8ae54 EB |
1751 | mapped_parents, nparents, author, committer, compat_extra); |
1752 | free_commit_extra_headers(compat_extra); | |
6206089c | 1753 | free(mapped_parents); |
1754 | ||
1755 | if (sign_commit && sign_commit_to_strbuf(&compat_sig, &compat_buffer, sign_commit)) { | |
1756 | result = -1; | |
1757 | goto out; | |
1758 | } | |
1759 | } | |
1760 | ||
1761 | if (sign_commit) { | |
1762 | struct sig_pairs { | |
1763 | struct strbuf *sig; | |
1764 | const struct git_hash_algo *algo; | |
1765 | } bufs [2] = { | |
1766 | { &compat_sig, r->compat_hash_algo }, | |
1767 | { &sig, r->hash_algo }, | |
1768 | }; | |
1769 | int i; | |
1770 | ||
1771 | /* | |
1772 | * We write algorithms in the order they were implemented in | |
1773 | * Git to produce a stable hash when multiple algorithms are | |
1774 | * used. | |
1775 | */ | |
1776 | if (r->compat_hash_algo && hash_algo_by_ptr(bufs[0].algo) > hash_algo_by_ptr(bufs[1].algo)) | |
1777 | SWAP(bufs[0], bufs[1]); | |
1778 | ||
1779 | /* | |
1780 | * We traverse each algorithm in order, and apply the signature | |
1781 | * to each buffer. | |
1782 | */ | |
1783 | for (i = 0; i < ARRAY_SIZE(bufs); i++) { | |
1784 | if (!bufs[i].algo) | |
1785 | continue; | |
6bcc5fa2 | 1786 | add_header_signature(&buffer, bufs[i].sig, bufs[i].algo); |
6206089c | 1787 | if (r->compat_hash_algo) |
6bcc5fa2 | 1788 | add_header_signature(&compat_buffer, bufs[i].sig, bufs[i].algo); |
6206089c | 1789 | } |
1790 | } | |
ba3c69a9 | 1791 | |
6206089c | 1792 | /* And check the encoding. */ |
1793 | if (encoding_is_utf8 && (!verify_utf8(&buffer) || !verify_utf8(&compat_buffer))) | |
1794 | fprintf(stderr, _(commit_utf8_warn)); | |
1795 | ||
1796 | if (r->compat_hash_algo) { | |
1797 | hash_object_file(r->compat_hash_algo, compat_buffer.buf, compat_buffer.len, | |
1798 | OBJ_COMMIT, &compat_oid_buf); | |
1799 | compat_oid = &compat_oid_buf; | |
1800 | } | |
1801 | ||
1802 | result = write_object_file_flags(buffer.buf, buffer.len, OBJ_COMMIT, | |
1803 | ret, compat_oid, 0); | |
e505146d | 1804 | out: |
6206089c | 1805 | free(parent_buf); |
40d52ff7 | 1806 | strbuf_release(&buffer); |
6206089c | 1807 | strbuf_release(&compat_buffer); |
1808 | strbuf_release(&sig); | |
1809 | strbuf_release(&compat_sig); | |
40d52ff7 JK |
1810 | return result; |
1811 | } | |
ae8e4c9c | 1812 | |
e2e5ac23 NTND |
1813 | define_commit_slab(merge_desc_slab, struct merge_remote_desc *); |
1814 | static struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab); | |
1815 | ||
1816 | struct merge_remote_desc *merge_remote_util(struct commit *commit) | |
1817 | { | |
1818 | return *merge_desc_slab_at(&merge_desc_slab, commit); | |
1819 | } | |
1820 | ||
beb518c9 RS |
1821 | void set_merge_remote_desc(struct commit *commit, |
1822 | const char *name, struct object *obj) | |
1823 | { | |
1824 | struct merge_remote_desc *desc; | |
5447a76a | 1825 | FLEX_ALLOC_STR(desc, name, name); |
beb518c9 | 1826 | desc->obj = obj; |
e2e5ac23 | 1827 | *merge_desc_slab_at(&merge_desc_slab, commit) = desc; |
beb518c9 RS |
1828 | } |
1829 | ||
ae8e4c9c JH |
1830 | struct commit *get_merge_parent(const char *name) |
1831 | { | |
1832 | struct object *obj; | |
1833 | struct commit *commit; | |
7683e2e6 | 1834 | struct object_id oid; |
d850b7a5 | 1835 | if (repo_get_oid(the_repository, name, &oid)) |
ae8e4c9c | 1836 | return NULL; |
109cd76d | 1837 | obj = parse_object(the_repository, &oid); |
d850b7a5 ÆAB |
1838 | commit = (struct commit *)repo_peel_to_type(the_repository, name, 0, |
1839 | obj, OBJ_COMMIT); | |
e2e5ac23 | 1840 | if (commit && !merge_remote_util(commit)) |
beb518c9 | 1841 | set_merge_remote_desc(commit, name, obj); |
ae8e4c9c JH |
1842 | return commit; |
1843 | } | |
89b5f1d9 RS |
1844 | |
1845 | /* | |
1846 | * Append a commit to the end of the commit_list. | |
1847 | * | |
1848 | * next starts by pointing to the variable that holds the head of an | |
1849 | * empty commit_list, and is updated to point to the "next" field of | |
1850 | * the last item on the list as new commits are appended. | |
1851 | * | |
1852 | * Usage example: | |
1853 | * | |
1854 | * struct commit_list *list; | |
1855 | * struct commit_list **next = &list; | |
1856 | * | |
1857 | * next = commit_list_append(c1, next); | |
1858 | * next = commit_list_append(c2, next); | |
1859 | * assert(commit_list_count(list) == 2); | |
1860 | * return list; | |
1861 | */ | |
1862 | struct commit_list **commit_list_append(struct commit *commit, | |
1863 | struct commit_list **next) | |
1864 | { | |
258c03eb BW |
1865 | struct commit_list *new_commit = xmalloc(sizeof(struct commit_list)); |
1866 | new_commit->item = commit; | |
1867 | *next = new_commit; | |
1868 | new_commit->next = NULL; | |
1869 | return &new_commit->next; | |
89b5f1d9 | 1870 | } |
efc7df45 | 1871 | |
cfc5cf42 JC |
1872 | const char *find_header_mem(const char *msg, size_t len, |
1873 | const char *key, size_t *out_len) | |
fe6eb7f2 JK |
1874 | { |
1875 | int key_len = strlen(key); | |
1876 | const char *line = msg; | |
1877 | ||
cfc5cf42 JC |
1878 | /* |
1879 | * NEEDSWORK: It's possible for strchrnul() to scan beyond the range | |
1880 | * given by len. However, current callers are safe because they compute | |
1881 | * len by scanning a NUL-terminated block of memory starting at msg. | |
1882 | * Nonetheless, it would be better to ensure the function does not look | |
1883 | * at msg beyond the len provided by the caller. | |
1884 | */ | |
1885 | while (line && line < msg + len) { | |
fe6eb7f2 JK |
1886 | const char *eol = strchrnul(line, '\n'); |
1887 | ||
1888 | if (line == eol) | |
1889 | return NULL; | |
1890 | ||
1891 | if (eol - line > key_len && | |
1892 | !strncmp(line, key, key_len) && | |
1893 | line[key_len] == ' ') { | |
1894 | *out_len = eol - line - key_len - 1; | |
1895 | return line + key_len + 1; | |
1896 | } | |
1897 | line = *eol ? eol + 1 : NULL; | |
1898 | } | |
1899 | return NULL; | |
1900 | } | |
0ed8a4e1 | 1901 | |
cfc5cf42 JC |
1902 | const char *find_commit_header(const char *msg, const char *key, size_t *out_len) |
1903 | { | |
1904 | return find_header_mem(msg, strlen(msg), key, out_len); | |
1905 | } | |
8c384589 | 1906 | /* |
710714aa | 1907 | * Inspect the given string and determine the true "end" of the log message, in |
3abd4a67 | 1908 | * order to find where to put a new Signed-off-by trailer. Ignored are |
d76650b8 BM |
1909 | * trailing comment lines and blank lines. To support "git commit -s |
1910 | * --amend" on an existing commit, we also ignore "Conflicts:". To | |
1911 | * support "git commit -v", we truncate at cut lines. | |
8c384589 CC |
1912 | * |
1913 | * Returns the number of bytes from the tail to ignore, to be fed as | |
1914 | * the second parameter to append_signoff(). | |
1915 | */ | |
7cb26a17 | 1916 | size_t ignored_log_message_bytes(const char *buf, size_t len) |
8c384589 | 1917 | { |
66e83d9b JK |
1918 | size_t boc = 0; |
1919 | size_t bol = 0; | |
8c384589 | 1920 | int in_old_conflicts_block = 0; |
d76650b8 | 1921 | size_t cutoff = wt_status_locate_end(buf, len); |
8c384589 | 1922 | |
d76650b8 | 1923 | while (bol < cutoff) { |
710714aa | 1924 | const char *next_line = memchr(buf + bol, '\n', len - bol); |
8c384589 | 1925 | |
710714aa JT |
1926 | if (!next_line) |
1927 | next_line = buf + len; | |
8c384589 CC |
1928 | else |
1929 | next_line++; | |
1930 | ||
710714aa | 1931 | if (buf[bol] == comment_line_char || buf[bol] == '\n') { |
8c384589 CC |
1932 | /* is this the first of the run of comments? */ |
1933 | if (!boc) | |
1934 | boc = bol; | |
1935 | /* otherwise, it is just continuing */ | |
710714aa | 1936 | } else if (starts_with(buf + bol, "Conflicts:\n")) { |
8c384589 CC |
1937 | in_old_conflicts_block = 1; |
1938 | if (!boc) | |
1939 | boc = bol; | |
710714aa | 1940 | } else if (in_old_conflicts_block && buf[bol] == '\t') { |
8c384589 CC |
1941 | ; /* a pathname in the conflicts block */ |
1942 | } else if (boc) { | |
1943 | /* the previous was not trailing comment */ | |
1944 | boc = 0; | |
1945 | in_old_conflicts_block = 0; | |
1946 | } | |
710714aa | 1947 | bol = next_line - buf; |
8c384589 | 1948 | } |
d76650b8 | 1949 | return boc ? len - boc : len - cutoff; |
8c384589 | 1950 | } |
49697cb7 PW |
1951 | |
1952 | int run_commit_hook(int editor_is_used, const char *index_file, | |
a8cc5943 | 1953 | int *invoked_hook, const char *name, ...) |
49697cb7 | 1954 | { |
f443246b | 1955 | struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT; |
49697cb7 | 1956 | va_list args; |
f443246b | 1957 | const char *arg; |
49697cb7 | 1958 | |
f443246b | 1959 | strvec_pushf(&opt.env, "GIT_INDEX_FILE=%s", index_file); |
49697cb7 PW |
1960 | |
1961 | /* | |
1962 | * Let the hook know that no editor will be launched. | |
1963 | */ | |
1964 | if (!editor_is_used) | |
f443246b | 1965 | strvec_push(&opt.env, "GIT_EDITOR=:"); |
49697cb7 PW |
1966 | |
1967 | va_start(args, name); | |
f443246b ES |
1968 | while ((arg = va_arg(args, const char *))) |
1969 | strvec_push(&opt.args, arg); | |
49697cb7 | 1970 | va_end(args); |
49697cb7 | 1971 | |
4369e3a1 | 1972 | opt.invoked_hook = invoked_hook; |
f443246b | 1973 | return run_hooks_opt(name, &opt); |
49697cb7 | 1974 | } |