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