?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fix sed string regex escaping in module_name.
[git/vmiklos.git] / commit.c
blob1fbdd2d51b8e798ac73c4b020f8fa47b1d6fb168
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
4 #include "pkt-line.h"
5 #include "utf8.h"
6 #include "interpolate.h"
7 #include "diff.h"
8 #include "revision.h"
9
10 int save_commit_buffer = 1;
11
12 struct sort_node
13 {
14 /*
15 * the number of children of the associated commit
16 * that also occur in the list being sorted.
17 */
18 unsigned int indegree;
19
20 /*
21 * reference to original list item that we will re-use
22 * on output.
23 */
24 struct commit_list * list_item;
25
26 };
27
28 const char *commit_type = "commit";
29
30 static struct cmt_fmt_map {
31 const char *n;
32 size_t cmp_len;
33 enum cmit_fmt v;
34 } cmt_fmts[] = {
35 { "raw", 1, CMIT_FMT_RAW },
36 { "medium", 1, CMIT_FMT_MEDIUM },
37 { "short", 1, CMIT_FMT_SHORT },
38 { "email", 1, CMIT_FMT_EMAIL },
39 { "full", 5, CMIT_FMT_FULL },
40 { "fuller", 5, CMIT_FMT_FULLER },
41 { "oneline", 1, CMIT_FMT_ONELINE },
42 { "format:", 7, CMIT_FMT_USERFORMAT},
43 };
44
45 static char *user_format;
46
47 enum cmit_fmt get_commit_format(const char *arg)
48 {
49 int i;
50
51 if (!arg || !*arg)
52 return CMIT_FMT_DEFAULT;
53 if (*arg == '=')
54 arg++;
55 if (!prefixcmp(arg, "format:")) {
56 if (user_format)
57 free(user_format);
58 user_format = xstrdup(arg + 7);
59 return CMIT_FMT_USERFORMAT;
60 }
61 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
62 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
63 !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
64 return cmt_fmts[i].v;
65 }
66
67 die("invalid --pretty format: %s", arg);
68 }
69
70 static struct commit *check_commit(struct object *obj,
71 const unsigned char *sha1,
72 int quiet)
73 {
74 if (obj->type != OBJ_COMMIT) {
75 if (!quiet)
76 error("Object %s is a %s, not a commit",
77 sha1_to_hex(sha1), typename(obj->type));
78 return NULL;
79 }
80 return (struct commit *) obj;
81 }
82
83 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
84 int quiet)
85 {
86 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
87
88 if (!obj)
89 return NULL;
90 return check_commit(obj, sha1, quiet);
91 }
92
93 struct commit *lookup_commit_reference(const unsigned char *sha1)
94 {
95 return lookup_commit_reference_gently(sha1, 0);
96 }
97
98 struct commit *lookup_commit(const unsigned char *sha1)
99 {
100 struct object *obj = lookup_object(sha1);
101 if (!obj)
102 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
103 if (!obj->type)
104 obj->type = OBJ_COMMIT;
105 return check_commit(obj, sha1, 0);
106 }
107
108 static unsigned long parse_commit_date(const char *buf)
109 {
110 unsigned long date;
111
112 if (memcmp(buf, "author", 6))
113 return 0;
114 while (*buf++ != '\n')
115 /* nada */;
116 if (memcmp(buf, "committer", 9))
117 return 0;
118 while (*buf++ != '>')
119 /* nada */;
120 date = strtoul(buf, NULL, 10);
121 if (date == ULONG_MAX)
122 date = 0;
123 return date;
124 }
125
126 static struct commit_graft **commit_graft;
127 static int commit_graft_alloc, commit_graft_nr;
128
129 static int commit_graft_pos(const unsigned char *sha1)
130 {
131 int lo, hi;
132 lo = 0;
133 hi = commit_graft_nr;
134 while (lo < hi) {
135 int mi = (lo + hi) / 2;
136 struct commit_graft *graft = commit_graft[mi];
137 int cmp = hashcmp(sha1, graft->sha1);
138 if (!cmp)
139 return mi;
140 if (cmp < 0)
141 hi = mi;
142 else
143 lo = mi + 1;
144 }
145 return -lo - 1;
146 }
147
148 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
149 {
150 int pos = commit_graft_pos(graft->sha1);
151
152 if (0 <= pos) {
153 if (ignore_dups)
154 free(graft);
155 else {
156 free(commit_graft[pos]);
157 commit_graft[pos] = graft;
158 }
159 return 1;
160 }
161 pos = -pos - 1;
162 if (commit_graft_alloc <= ++commit_graft_nr) {
163 commit_graft_alloc = alloc_nr(commit_graft_alloc);
164 commit_graft = xrealloc(commit_graft,
165 sizeof(*commit_graft) *
166 commit_graft_alloc);
167 }
168 if (pos < commit_graft_nr)
169 memmove(commit_graft + pos + 1,
170 commit_graft + pos,
171 (commit_graft_nr - pos - 1) *
172 sizeof(*commit_graft));
173 commit_graft[pos] = graft;
174 return 0;
175 }
176
177 struct commit_graft *read_graft_line(char *buf, int len)
178 {
179 /* The format is just "Commit Parent1 Parent2 ...\n" */
180 int i;
181 struct commit_graft *graft = NULL;
182
183 if (buf[len-1] == '\n')
184 buf[--len] = 0;
185 if (buf[0] == '#' || buf[0] == '\0')
186 return NULL;
187 if ((len + 1) % 41) {
188 bad_graft_data:
189 error("bad graft data: %s", buf);
190 free(graft);
191 return NULL;
192 }
193 i = (len + 1) / 41 - 1;
194 graft = xmalloc(sizeof(*graft) + 20 * i);
195 graft->nr_parent = i;
196 if (get_sha1_hex(buf, graft->sha1))
197 goto bad_graft_data;
198 for (i = 40; i < len; i += 41) {
199 if (buf[i] != ' ')
200 goto bad_graft_data;
201 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
202 goto bad_graft_data;
203 }
204 return graft;
205 }
206
207 int read_graft_file(const char *graft_file)
208 {
209 FILE *fp = fopen(graft_file, "r");
210 char buf[1024];
211 if (!fp)
212 return -1;
213 while (fgets(buf, sizeof(buf), fp)) {
214 /* The format is just "Commit Parent1 Parent2 ...\n" */
215 int len = strlen(buf);
216 struct commit_graft *graft = read_graft_line(buf, len);
217 if (!graft)
218 continue;
219 if (register_commit_graft(graft, 1))
220 error("duplicate graft data: %s", buf);
221 }
222 fclose(fp);
223 return 0;
224 }
225
226 static void prepare_commit_graft(void)
227 {
228 static int commit_graft_prepared;
229 char *graft_file;
230
231 if (commit_graft_prepared)
232 return;
233 graft_file = get_graft_file();
234 read_graft_file(graft_file);
235 /* make sure shallows are read */
236 is_repository_shallow();
237 commit_graft_prepared = 1;
238 }
239
240 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
241 {
242 int pos;
243 prepare_commit_graft();
244 pos = commit_graft_pos(sha1);
245 if (pos < 0)
246 return NULL;
247 return commit_graft[pos];
248 }
249
250 int write_shallow_commits(int fd, int use_pack_protocol)
251 {
252 int i, count = 0;
253 for (i = 0; i < commit_graft_nr; i++)
254 if (commit_graft[i]->nr_parent < 0) {
255 const char *hex =
256 sha1_to_hex(commit_graft[i]->sha1);
257 count++;
258 if (use_pack_protocol)
259 packet_write(fd, "shallow %s", hex);
260 else {
261 if (write_in_full(fd, hex, 40) != 40)
262 break;
263 if (write_in_full(fd, "\n", 1) != 1)
264 break;
265 }
266 }
267 return count;
268 }
269
270 int unregister_shallow(const unsigned char *sha1)
271 {
272 int pos = commit_graft_pos(sha1);
273 if (pos < 0)
274 return -1;
275 if (pos + 1 < commit_graft_nr)
276 memcpy(commit_graft + pos, commit_graft + pos + 1,
277 sizeof(struct commit_graft *)
278 * (commit_graft_nr - pos - 1));
279 commit_graft_nr--;
280 return 0;
281 }
282
283 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
284 {
285 char *tail = buffer;
286 char *bufptr = buffer;
287 unsigned char parent[20];
288 struct commit_list **pptr;
289 struct commit_graft *graft;
290 unsigned n_refs = 0;
291
292 if (item->object.parsed)
293 return 0;
294 item->object.parsed = 1;
295 tail += size;
296 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
297 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
298 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
299 return error("bad tree pointer in commit %s",
300 sha1_to_hex(item->object.sha1));
301 item->tree = lookup_tree(parent);
302 if (item->tree)
303 n_refs++;
304 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
305 pptr = &item->parents;
306
307 graft = lookup_commit_graft(item->object.sha1);
308 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
309 struct commit *new_parent;
310
311 if (tail <= bufptr + 48 ||
312 get_sha1_hex(bufptr + 7, parent) ||
313 bufptr[47] != '\n')
314 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
315 bufptr += 48;
316 if (graft)
317 continue;
318 new_parent = lookup_commit(parent);
319 if (new_parent) {
320 pptr = &commit_list_insert(new_parent, pptr)->next;
321 n_refs++;
322 }
323 }
324 if (graft) {
325 int i;
326 struct commit *new_parent;
327 for (i = 0; i < graft->nr_parent; i++) {
328 new_parent = lookup_commit(graft->parent[i]);
329 if (!new_parent)
330 continue;
331 pptr = &commit_list_insert(new_parent, pptr)->next;
332 n_refs++;
333 }
334 }
335 item->date = parse_commit_date(bufptr);
336
337 if (track_object_refs) {
338 unsigned i = 0;
339 struct commit_list *p;
340 struct object_refs *refs = alloc_object_refs(n_refs);
341 if (item->tree)
342 refs->ref[i++] = &item->tree->object;
343 for (p = item->parents; p; p = p->next)
344 refs->ref[i++] = &p->item->object;
345 set_object_refs(&item->object, refs);
346 }
347
348 return 0;
349 }
350
351 int parse_commit(struct commit *item)
352 {
353 enum object_type type;
354 void *buffer;
355 unsigned long size;
356 int ret;
357
358 if (item->object.parsed)
359 return 0;
360 buffer = read_sha1_file(item->object.sha1, &type, &size);
361 if (!buffer)
362 return error("Could not read %s",
363 sha1_to_hex(item->object.sha1));
364 if (type != OBJ_COMMIT) {
365 free(buffer);
366 return error("Object %s not a commit",
367 sha1_to_hex(item->object.sha1));
368 }
369 ret = parse_commit_buffer(item, buffer, size);
370 if (save_commit_buffer && !ret) {
371 item->buffer = buffer;
372 return 0;
373 }
374 free(buffer);
375 return ret;
376 }
377
378 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
379 {
380 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
381 new_list->item = item;
382 new_list->next = *list_p;
383 *list_p = new_list;
384 return new_list;
385 }
386
387 void free_commit_list(struct commit_list *list)
388 {
389 while (list) {
390 struct commit_list *temp = list;
391 list = temp->next;
392 free(temp);
393 }
394 }
395
396 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
397 {
398 struct commit_list **pp = list;
399 struct commit_list *p;
400 while ((p = *pp) != NULL) {
401 if (p->item->date < item->date) {
402 break;
403 }
404 pp = &p->next;
405 }
406 return commit_list_insert(item, pp);
407 }
408
409
410 void sort_by_date(struct commit_list **list)
411 {
412 struct commit_list *ret = NULL;
413 while (*list) {
414 insert_by_date((*list)->item, &ret);
415 *list = (*list)->next;
416 }
417 *list = ret;
418 }
419
420 struct commit *pop_most_recent_commit(struct commit_list **list,
421 unsigned int mark)
422 {
423 struct commit *ret = (*list)->item;
424 struct commit_list *parents = ret->parents;
425 struct commit_list *old = *list;
426
427 *list = (*list)->next;
428 free(old);
429
430 while (parents) {
431 struct commit *commit = parents->item;
432 parse_commit(commit);
433 if (!(commit->object.flags & mark)) {
434 commit->object.flags |= mark;
435 insert_by_date(commit, list);
436 }
437 parents = parents->next;
438 }
439 return ret;
440 }
441
442 void clear_commit_marks(struct commit *commit, unsigned int mark)
443 {
444 while (commit) {
445 struct commit_list *parents;
446
447 if (!(mark & commit->object.flags))
448 return;
449
450 commit->object.flags &= ~mark;
451
452 parents = commit->parents;
453 if (!parents)
454 return;
455
456 while ((parents = parents->next))
457 clear_commit_marks(parents->item, mark);
458
459 commit = commit->parents->item;
460 }
461 }
462
463 /*
464 * Generic support for pretty-printing the header
465 */
466 static int get_one_line(const char *msg, unsigned long len)
467 {
468 int ret = 0;
469
470 while (len--) {
471 char c = *msg++;
472 if (!c)
473 break;
474 ret++;
475 if (c == '\n')
476 break;
477 }
478 return ret;
479 }
480
481 /* High bit set, or ISO-2022-INT */
482 static int non_ascii(int ch)
483 {
484 ch = (ch & 0xff);
485 return ((ch & 0x80) || (ch == 0x1b));
486 }
487
488 static int is_rfc2047_special(char ch)
489 {
490 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
491 }
492
493 static int add_rfc2047(char *buf, const char *line, int len,
494 const char *encoding)
495 {
496 char *bp = buf;
497 int i, needquote;
498 char q_encoding[128];
499 const char *q_encoding_fmt = "=?%s?q?";
500
501 for (i = needquote = 0; !needquote && i < len; i++) {
502 int ch = line[i];
503 if (non_ascii(ch))
504 needquote++;
505 if ((i + 1 < len) &&
506 (ch == '=' && line[i+1] == '?'))
507 needquote++;
508 }
509 if (!needquote)
510 return sprintf(buf, "%.*s", len, line);
511
512 i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
513 if (sizeof(q_encoding) < i)
514 die("Insanely long encoding name %s", encoding);
515 memcpy(bp, q_encoding, i);
516 bp += i;
517 for (i = 0; i < len; i++) {
518 unsigned ch = line[i] & 0xFF;
519 /*
520 * We encode ' ' using '=20' even though rfc2047
521 * allows using '_' for readability. Unfortunately,
522 * many programs do not understand this and just
523 * leave the underscore in place.
524 */
525 if (is_rfc2047_special(ch) || ch == ' ') {
526 sprintf(bp, "=%02X", ch);
527 bp += 3;
528 }
529 else
530 *bp++ = ch;
531 }
532 memcpy(bp, "?=", 2);
533 bp += 2;
534 return bp - buf;
535 }
536
537 static unsigned long bound_rfc2047(unsigned long len, const char *encoding)
538 {
539 /* upper bound of q encoded string of length 'len' */
540 unsigned long elen = strlen(encoding);
541
542 return len * 3 + elen + 100;
543 }
544
545 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
546 const char *line, enum date_mode dmode,
547 const char *encoding)
548 {
549 char *date;
550 int namelen;
551 unsigned long time;
552 int tz, ret;
553 const char *filler = " ";
554
555 if (fmt == CMIT_FMT_ONELINE)
556 return 0;
557 date = strchr(line, '>');
558 if (!date)
559 return 0;
560 namelen = ++date - line;
561 time = strtoul(date, &date, 10);
562 tz = strtol(date, NULL, 10);
563
564 if (fmt == CMIT_FMT_EMAIL) {
565 char *name_tail = strchr(line, '<');
566 int display_name_length;
567 if (!name_tail)
568 return 0;
569 while (line < name_tail && isspace(name_tail[-1]))
570 name_tail--;
571 display_name_length = name_tail - line;
572 filler = "";
573 strcpy(buf, "From: ");
574 ret = strlen(buf);
575 ret += add_rfc2047(buf + ret, line, display_name_length,
576 encoding);
577 memcpy(buf + ret, name_tail, namelen - display_name_length);
578 ret += namelen - display_name_length;
579 buf[ret++] = '\n';
580 }
581 else {
582 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
583 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
584 filler, namelen, line);
585 }
586 switch (fmt) {
587 case CMIT_FMT_MEDIUM:
588 ret += sprintf(buf + ret, "Date: %s\n",
589 show_date(time, tz, dmode));
590 break;
591 case CMIT_FMT_EMAIL:
592 ret += sprintf(buf + ret, "Date: %s\n",
593 show_date(time, tz, DATE_RFC2822));
594 break;
595 case CMIT_FMT_FULLER:
596 ret += sprintf(buf + ret, "%sDate: %s\n", what,
597 show_date(time, tz, dmode));
598 break;
599 default:
600 /* notin' */
601 break;
602 }
603 return ret;
604 }
605
606 static int is_empty_line(const char *line, int *len_p)
607 {
608 int len = *len_p;
609 while (len && isspace(line[len-1]))
610 len--;
611 *len_p = len;
612 return !len;
613 }
614
615 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
616 {
617 struct commit_list *parent = commit->parents;
618 int offset;
619
620 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
621 !parent || !parent->next)
622 return 0;
623
624 offset = sprintf(buf, "Merge:");
625
626 while (parent) {
627 struct commit *p = parent->item;
628 const char *hex = NULL;
629 const char *dots;
630 if (abbrev)
631 hex = find_unique_abbrev(p->object.sha1, abbrev);
632 if (!hex)
633 hex = sha1_to_hex(p->object.sha1);
634 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
635 parent = parent->next;
636
637 offset += sprintf(buf + offset, " %s%s", hex, dots);
638 }
639 buf[offset++] = '\n';
640 return offset;
641 }
642
643 static char *get_header(const struct commit *commit, const char *key)
644 {
645 int key_len = strlen(key);
646 const char *line = commit->buffer;
647
648 for (;;) {
649 const char *eol = strchr(line, '\n'), *next;
650
651 if (line == eol)
652 return NULL;
653 if (!eol) {
654 eol = line + strlen(line);
655 next = NULL;
656 } else
657 next = eol + 1;
658 if (eol - line > key_len &&
659 !strncmp(line, key, key_len) &&
660 line[key_len] == ' ') {
661 int len = eol - line - key_len;
662 char *ret = xmalloc(len);
663 memcpy(ret, line + key_len + 1, len - 1);
664 ret[len - 1] = '\0';
665 return ret;
666 }
667 line = next;
668 }
669 }
670
671 static char *replace_encoding_header(char *buf, const char *encoding)
672 {
673 char *encoding_header = strstr(buf, "\nencoding ");
674 char *header_end = strstr(buf, "\n\n");
675 char *end_of_encoding_header;
676 int encoding_header_pos;
677 int encoding_header_len;
678 int new_len;
679 int need_len;
680 int buflen = strlen(buf) + 1;
681
682 if (!header_end)
683 header_end = buf + buflen;
684 if (!encoding_header || encoding_header >= header_end)
685 return buf;
686 encoding_header++;
687 end_of_encoding_header = strchr(encoding_header, '\n');
688 if (!end_of_encoding_header)
689 return buf; /* should not happen but be defensive */
690 end_of_encoding_header++;
691
692 encoding_header_len = end_of_encoding_header - encoding_header;
693 encoding_header_pos = encoding_header - buf;
694
695 if (is_encoding_utf8(encoding)) {
696 /* we have re-coded to UTF-8; drop the header */
697 memmove(encoding_header, end_of_encoding_header,
698 buflen - (encoding_header_pos + encoding_header_len));
699 return buf;
700 }
701 new_len = strlen(encoding);
702 need_len = new_len + strlen("encoding \n");
703 if (encoding_header_len < need_len) {
704 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
705 encoding_header = buf + encoding_header_pos;
706 end_of_encoding_header = encoding_header + encoding_header_len;
707 }
708 memmove(end_of_encoding_header + (need_len - encoding_header_len),
709 end_of_encoding_header,
710 buflen - (encoding_header_pos + encoding_header_len));
711 memcpy(encoding_header + 9, encoding, strlen(encoding));
712 encoding_header[9 + new_len] = '\n';
713 return buf;
714 }
715
716 static char *logmsg_reencode(const struct commit *commit,
717 const char *output_encoding)
718 {
719 static const char *utf8 = "utf-8";
720 const char *use_encoding;
721 char *encoding;
722 char *out;
723
724 if (!*output_encoding)
725 return NULL;
726 encoding = get_header(commit, "encoding");
727 use_encoding = encoding ? encoding : utf8;
728 if (!strcmp(use_encoding, output_encoding))
729 if (encoding) /* we'll strip encoding header later */
730 out = xstrdup(commit->buffer);
731 else
732 return NULL; /* nothing to do */
733 else
734 out = reencode_string(commit->buffer,
735 output_encoding, use_encoding);
736 if (out)
737 out = replace_encoding_header(out, output_encoding);
738
739 free(encoding);
740 return out;
741 }
742
743 static void fill_person(struct interp *table, const char *msg, int len)
744 {
745 int start, end, tz = 0;
746 unsigned long date;
747 char *ep;
748
749 /* parse name */
750 for (end = 0; end < len && msg[end] != '<'; end++)
751 ; /* do nothing */
752 start = end + 1;
753 while (end > 0 && isspace(msg[end - 1]))
754 end--;
755 table[0].value = xstrndup(msg, end);
756
757 if (start >= len)
758 return;
759
760 /* parse email */
761 for (end = start + 1; end < len && msg[end] != '>'; end++)
762 ; /* do nothing */
763
764 if (end >= len)
765 return;
766
767 table[1].value = xstrndup(msg + start, end - start);
768
769 /* parse date */
770 for (start = end + 1; start < len && isspace(msg[start]); start++)
771 ; /* do nothing */
772 if (start >= len)
773 return;
774 date = strtoul(msg + start, &ep, 10);
775 if (msg + start == ep)
776 return;
777
778 table[5].value = xstrndup(msg + start, ep - (msg + start));
779
780 /* parse tz */
781 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
782 ; /* do nothing */
783 if (start + 1 < len) {
784 tz = strtoul(msg + start + 1, NULL, 10);
785 if (msg[start] == '-')
786 tz = -tz;
787 }
788
789 interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
790 interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
791 interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
792 interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
793 }
794
795 static long format_commit_message(const struct commit *commit,
796 const char *msg, char **buf_p, unsigned long *space_p)
797 {
798 struct interp table[] = {
799 { "%H" }, /* commit hash */
800 { "%h" }, /* abbreviated commit hash */
801 { "%T" }, /* tree hash */
802 { "%t" }, /* abbreviated tree hash */
803 { "%P" }, /* parent hashes */
804 { "%p" }, /* abbreviated parent hashes */
805 { "%an" }, /* author name */
806 { "%ae" }, /* author email */
807 { "%ad" }, /* author date */
808 { "%aD" }, /* author date, RFC2822 style */
809 { "%ar" }, /* author date, relative */
810 { "%at" }, /* author date, UNIX timestamp */
811 { "%ai" }, /* author date, ISO 8601 */
812 { "%cn" }, /* committer name */
813 { "%ce" }, /* committer email */
814 { "%cd" }, /* committer date */
815 { "%cD" }, /* committer date, RFC2822 style */
816 { "%cr" }, /* committer date, relative */
817 { "%ct" }, /* committer date, UNIX timestamp */
818 { "%ci" }, /* committer date, ISO 8601 */
819 { "%e" }, /* encoding */
820 { "%s" }, /* subject */
821 { "%b" }, /* body */
822 { "%Cred" }, /* red */
823 { "%Cgreen" }, /* green */
824 { "%Cblue" }, /* blue */
825 { "%Creset" }, /* reset color */
826 { "%n" }, /* newline */
827 { "%m" }, /* left/right/bottom */
828 };
829 enum interp_index {
830 IHASH = 0, IHASH_ABBREV,
831 ITREE, ITREE_ABBREV,
832 IPARENTS, IPARENTS_ABBREV,
833 IAUTHOR_NAME, IAUTHOR_EMAIL,
834 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
835 IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
836 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
837 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
838 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
839 ICOMMITTER_ISO8601,
840 IENCODING,
841 ISUBJECT,
842 IBODY,
843 IRED, IGREEN, IBLUE, IRESET_COLOR,
844 INEWLINE,
845 ILEFT_RIGHT,
846 };
847 struct commit_list *p;
848 char parents[1024];
849 int i;
850 enum { HEADER, SUBJECT, BODY } state;
851
852 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
853 die("invalid interp table!");
854
855 /* these are independent of the commit */
856 interp_set_entry(table, IRED, "\033[31m");
857 interp_set_entry(table, IGREEN, "\033[32m");
858 interp_set_entry(table, IBLUE, "\033[34m");
859 interp_set_entry(table, IRESET_COLOR, "\033[m");
860 interp_set_entry(table, INEWLINE, "\n");
861
862 /* these depend on the commit */
863 if (!commit->object.parsed)
864 parse_object(commit->object.sha1);
865 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
866 interp_set_entry(table, IHASH_ABBREV,
867 find_unique_abbrev(commit->object.sha1,
868 DEFAULT_ABBREV));
869 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
870 interp_set_entry(table, ITREE_ABBREV,
871 find_unique_abbrev(commit->tree->object.sha1,
872 DEFAULT_ABBREV));
873 interp_set_entry(table, ILEFT_RIGHT,
874 (commit->object.flags & BOUNDARY)
875 ? "-"
876 : (commit->object.flags & SYMMETRIC_LEFT)
877 ? "<"
878 : ">");
879
880 parents[1] = 0;
881 for (i = 0, p = commit->parents;
882 p && i < sizeof(parents) - 1;
883 p = p->next)
884 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
885 sha1_to_hex(p->item->object.sha1));
886 interp_set_entry(table, IPARENTS, parents + 1);
887
888 parents[1] = 0;
889 for (i = 0, p = commit->parents;
890 p && i < sizeof(parents) - 1;
891 p = p->next)
892 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
893 find_unique_abbrev(p->item->object.sha1,
894 DEFAULT_ABBREV));
895 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
896
897 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
898 int eol;
899 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
900 ; /* do nothing */
901
902 if (state == SUBJECT) {
903 table[ISUBJECT].value = xstrndup(msg + i, eol - i);
904 i = eol;
905 }
906 if (i == eol) {
907 state++;
908 /* strip empty lines */
909 while (msg[eol + 1] == '\n')
910 eol++;
911 } else if (!prefixcmp(msg + i, "author "))
912 fill_person(table + IAUTHOR_NAME,
913 msg + i + 7, eol - i - 7);
914 else if (!prefixcmp(msg + i, "committer "))
915 fill_person(table + ICOMMITTER_NAME,
916 msg + i + 10, eol - i - 10);
917 else if (!prefixcmp(msg + i, "encoding "))
918 table[IENCODING].value =
919 xstrndup(msg + i + 9, eol - i - 9);
920 i = eol;
921 }
922 if (msg[i])
923 table[IBODY].value = xstrdup(msg + i);
924 for (i = 0; i < ARRAY_SIZE(table); i++)
925 if (!table[i].value)
926 interp_set_entry(table, i, "<unknown>");
927
928 do {
929 char *buf = *buf_p;
930 unsigned long space = *space_p;
931
932 space = interpolate(buf, space, user_format,
933 table, ARRAY_SIZE(table));
934 if (!space)
935 break;
936 buf = xrealloc(buf, space);
937 *buf_p = buf;
938 *space_p = space;
939 } while (1);
940 interp_clear_table(table, ARRAY_SIZE(table));
941
942 return strlen(*buf_p);
943 }
944
945 static void pp_header(enum cmit_fmt fmt,
946 int abbrev,
947 enum date_mode dmode,
948 const char *encoding,
949 const struct commit *commit,
950 const char **msg_p,
951 unsigned long *len_p,
952 unsigned long *ofs_p,
953 char **buf_p,
954 unsigned long *space_p)
955 {
956 int parents_shown = 0;
957
958 for (;;) {
959 const char *line = *msg_p;
960 char *dst;
961 int linelen = get_one_line(*msg_p, *len_p);
962 unsigned long len;
963
964 if (!linelen)
965 return;
966 *msg_p += linelen;
967 *len_p -= linelen;
968
969 if (linelen == 1)
970 /* End of header */
971 return;
972
973 ALLOC_GROW(*buf_p, linelen + *ofs_p + 20, *space_p);
974 dst = *buf_p + *ofs_p;
975
976 if (fmt == CMIT_FMT_RAW) {
977 memcpy(dst, line, linelen);
978 *ofs_p += linelen;
979 continue;
980 }
981
982 if (!memcmp(line, "parent ", 7)) {
983 if (linelen != 48)
984 die("bad parent line in commit");
985 continue;
986 }
987
988 if (!parents_shown) {
989 struct commit_list *parent;
990 int num;
991 for (parent = commit->parents, num = 0;
992 parent;
993 parent = parent->next, num++)
994 ;
995 /* with enough slop */
996 num = *ofs_p + num * 50 + 20;
997 ALLOC_GROW(*buf_p, num, *space_p);
998 dst = *buf_p + *ofs_p;
999 *ofs_p += add_merge_info(fmt, dst, commit, abbrev);
1000 parents_shown = 1;
1001 }
1002
1003 /*
1004 * MEDIUM == DEFAULT shows only author with dates.
1005 * FULL shows both authors but not dates.
1006 * FULLER shows both authors and dates.
1007 */
1008 if (!memcmp(line, "author ", 7)) {
1009 len = linelen;
1010 if (fmt == CMIT_FMT_EMAIL)
1011 len = bound_rfc2047(linelen, encoding);
1012 ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p);
1013 dst = *buf_p + *ofs_p;
1014 *ofs_p += add_user_info("Author", fmt, dst,
1015 line + 7, dmode, encoding);
1016 }
1017
1018 if (!memcmp(line, "committer ", 10) &&
1019 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
1020 len = linelen;
1021 if (fmt == CMIT_FMT_EMAIL)
1022 len = bound_rfc2047(linelen, encoding);
1023 ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p);
1024 dst = *buf_p + *ofs_p;
1025 *ofs_p += add_user_info("Commit", fmt, dst,
1026 line + 10, dmode, encoding);
1027 }
1028 }
1029 }
1030
1031 static void pp_title_line(enum cmit_fmt fmt,
1032 const char **msg_p,
1033 unsigned long *len_p,
1034 unsigned long *ofs_p,
1035 char **buf_p,
1036 unsigned long *space_p,
1037 int indent,
1038 const char *subject,
1039 const char *after_subject,
1040 const char *encoding,
1041 int plain_non_ascii)
1042 {
1043 char *title;
1044 unsigned long title_alloc, title_len;
1045 unsigned long len;
1046
1047 title_len = 0;
1048 title_alloc = 80;
1049 title = xmalloc(title_alloc);
1050 for (;;) {
1051 const char *line = *msg_p;
1052 int linelen = get_one_line(line, *len_p);
1053 *msg_p += linelen;
1054 *len_p -= linelen;
1055
1056 if (!linelen || is_empty_line(line, &linelen))
1057 break;
1058
1059 if (title_alloc <= title_len + linelen + 2) {
1060 title_alloc = title_len + linelen + 80;
1061 title = xrealloc(title, title_alloc);
1062 }
1063 len = 0;
1064 if (title_len) {
1065 if (fmt == CMIT_FMT_EMAIL) {
1066 len++;
1067 title[title_len++] = '\n';
1068 }
1069 len++;
1070 title[title_len++] = ' ';
1071 }
1072 memcpy(title + title_len, line, linelen);
1073 title_len += linelen;
1074 }
1075
1076 /* Enough slop for the MIME header and rfc2047 */
1077 len = bound_rfc2047(title_len, encoding)+ 1000;
1078 if (subject)
1079 len += strlen(subject);
1080 if (after_subject)
1081 len += strlen(after_subject);
1082 if (encoding)
1083 len += strlen(encoding);
1084 ALLOC_GROW(*buf_p, title_len + *ofs_p + len, *space_p);
1085
1086 if (subject) {
1087 len = strlen(subject);
1088 memcpy(*buf_p + *ofs_p, subject, len);
1089 *ofs_p += len;
1090 *ofs_p += add_rfc2047(*buf_p + *ofs_p,
1091 title, title_len, encoding);
1092 } else {
1093 memcpy(*buf_p + *ofs_p, title, title_len);
1094 *ofs_p += title_len;
1095 }
1096 (*buf_p)[(*ofs_p)++] = '\n';
1097 if (plain_non_ascii) {
1098 const char *header_fmt =
1099 "MIME-Version: 1.0\n"
1100 "Content-Type: text/plain; charset=%s\n"
1101 "Content-Transfer-Encoding: 8bit\n";
1102 *ofs_p += snprintf(*buf_p + *ofs_p,
1103 *space_p - *ofs_p,
1104 header_fmt, encoding);
1105 }
1106 if (after_subject) {
1107 len = strlen(after_subject);
1108 memcpy(*buf_p + *ofs_p, after_subject, len);
1109 *ofs_p += len;
1110 }
1111 free(title);
1112 if (fmt == CMIT_FMT_EMAIL) {
1113 ALLOC_GROW(*buf_p, *ofs_p + 20, *space_p);
1114 (*buf_p)[(*ofs_p)++] = '\n';
1115 }
1116 }
1117
1118 static void pp_remainder(enum cmit_fmt fmt,
1119 const char **msg_p,
1120 unsigned long *len_p,
1121 unsigned long *ofs_p,
1122 char **buf_p,
1123 unsigned long *space_p,
1124 int indent)
1125 {
1126 int first = 1;
1127 for (;;) {
1128 const char *line = *msg_p;
1129 int linelen = get_one_line(line, *len_p);
1130 *msg_p += linelen;
1131 *len_p -= linelen;
1132
1133 if (!linelen)
1134 break;
1135
1136 if (is_empty_line(line, &linelen)) {
1137 if (first)
1138 continue;
1139 if (fmt == CMIT_FMT_SHORT)
1140 break;
1141 }
1142 first = 0;
1143
1144 ALLOC_GROW(*buf_p, *ofs_p + linelen + indent + 20, *space_p);
1145 if (indent) {
1146 memset(*buf_p + *ofs_p, ' ', indent);
1147 *ofs_p += indent;
1148 }
1149 memcpy(*buf_p + *ofs_p, line, linelen);
1150 *ofs_p += linelen;
1151 (*buf_p)[(*ofs_p)++] = '\n';
1152 }
1153 }
1154
1155 unsigned long pretty_print_commit(enum cmit_fmt fmt,
1156 const struct commit *commit,
1157 unsigned long len,
1158 char **buf_p, unsigned long *space_p,
1159 int abbrev, const char *subject,
1160 const char *after_subject,
1161 enum date_mode dmode)
1162 {
1163 unsigned long offset = 0;
1164 unsigned long beginning_of_body;
1165 int indent = 4;
1166 const char *msg = commit->buffer;
1167 int plain_non_ascii = 0;
1168 char *reencoded;
1169 const char *encoding;
1170 char *buf;
1171
1172 if (fmt == CMIT_FMT_USERFORMAT)
1173 return format_commit_message(commit, msg, buf_p, space_p);
1174
1175 encoding = (git_log_output_encoding
1176 ? git_log_output_encoding
1177 : git_commit_encoding);
1178 if (!encoding)
1179 encoding = "utf-8";
1180 reencoded = logmsg_reencode(commit, encoding);
1181 if (reencoded) {
1182 msg = reencoded;
1183 len = strlen(reencoded);
1184 }
1185
1186 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1187 indent = 0;
1188
1189 /* After-subject is used to pass in Content-Type: multipart
1190 * MIME header; in that case we do not have to do the
1191 * plaintext content type even if the commit message has
1192 * non 7-bit ASCII character. Otherwise, check if we need
1193 * to say this is not a 7-bit ASCII.
1194 */
1195 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
1196 int i, ch, in_body;
1197
1198 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
1199 if (!in_body) {
1200 /* author could be non 7-bit ASCII but
1201 * the log may be so; skip over the
1202 * header part first.
1203 */
1204 if (ch == '\n' &&
1205 i + 1 < len && msg[i+1] == '\n')
1206 in_body = 1;
1207 }
1208 else if (non_ascii(ch)) {
1209 plain_non_ascii = 1;
1210 break;
1211 }
1212 }
1213 }
1214
1215 pp_header(fmt, abbrev, dmode, encoding,
1216 commit, &msg, &len,
1217 &offset, buf_p, space_p);
1218 if (fmt != CMIT_FMT_ONELINE && !subject) {
1219 ALLOC_GROW(*buf_p, offset + 20, *space_p);
1220 (*buf_p)[offset++] = '\n';
1221 }
1222
1223 /* Skip excess blank lines at the beginning of body, if any... */
1224 for (;;) {
1225 int linelen = get_one_line(msg, len);
1226 int ll = linelen;
1227 if (!linelen)
1228 break;
1229 if (!is_empty_line(msg, &ll))
1230 break;
1231 msg += linelen;
1232 len -= linelen;
1233 }
1234
1235 /* These formats treat the title line specially. */
1236 if (fmt == CMIT_FMT_ONELINE
1237 || fmt == CMIT_FMT_EMAIL)
1238 pp_title_line(fmt, &msg, &len, &offset,
1239 buf_p, space_p, indent,
1240 subject, after_subject, encoding,
1241 plain_non_ascii);
1242
1243 beginning_of_body = offset;
1244 if (fmt != CMIT_FMT_ONELINE)
1245 pp_remainder(fmt, &msg, &len, &offset,
1246 buf_p, space_p, indent);
1247
1248 while (offset && isspace((*buf_p)[offset-1]))
1249 offset--;
1250
1251 ALLOC_GROW(*buf_p, offset + 20, *space_p);
1252 buf = *buf_p;
1253
1254 /* Make sure there is an EOLN for the non-oneline case */
1255 if (fmt != CMIT_FMT_ONELINE)
1256 buf[offset++] = '\n';
1257
1258 /*
1259 * The caller may append additional body text in e-mail
1260 * format. Make sure we did not strip the blank line
1261 * between the header and the body.
1262 */
1263 if (fmt == CMIT_FMT_EMAIL && offset <= beginning_of_body)
1264 buf[offset++] = '\n';
1265 buf[offset] = '\0';
1266 free(reencoded);
1267 return offset;
1268 }
1269
1270 struct commit *pop_commit(struct commit_list **stack)
1271 {
1272 struct commit_list *top = *stack;
1273 struct commit *item = top ? top->item : NULL;
1274
1275 if (top) {
1276 *stack = top->next;
1277 free(top);
1278 }
1279 return item;
1280 }
1281
1282 void topo_sort_default_setter(struct commit *c, void *data)
1283 {
1284 c->util = data;
1285 }
1286
1287 void *topo_sort_default_getter(struct commit *c)
1288 {
1289 return c->util;
1290 }
1291
1292 /*
1293 * Performs an in-place topological sort on the list supplied.
1294 */
1295 void sort_in_topological_order(struct commit_list ** list, int lifo)
1296 {
1297 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1298 topo_sort_default_getter);
1299 }
1300
1301 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1302 topo_sort_set_fn_t setter,
1303 topo_sort_get_fn_t getter)
1304 {
1305 struct commit_list * next = *list;
1306 struct commit_list * work = NULL, **insert;
1307 struct commit_list ** pptr = list;
1308 struct sort_node * nodes;
1309 struct sort_node * next_nodes;
1310 int count = 0;
1311
1312 /* determine the size of the list */
1313 while (next) {
1314 next = next->next;
1315 count++;
1316 }
1317
1318 if (!count)
1319 return;
1320 /* allocate an array to help sort the list */
1321 nodes = xcalloc(count, sizeof(*nodes));
1322 /* link the list to the array */
1323 next_nodes = nodes;
1324 next=*list;
1325 while (next) {
1326 next_nodes->list_item = next;
1327 setter(next->item, next_nodes);
1328 next_nodes++;
1329 next = next->next;
1330 }
1331 /* update the indegree */
1332 next=*list;
1333 while (next) {
1334 struct commit_list * parents = next->item->parents;
1335 while (parents) {
1336 struct commit * parent=parents->item;
1337 struct sort_node * pn = (struct sort_node *) getter(parent);
1338
1339 if (pn)
1340 pn->indegree++;
1341 parents=parents->next;
1342 }
1343 next=next->next;
1344 }
1345 /*
1346 * find the tips
1347 *
1348 * tips are nodes not reachable from any other node in the list
1349 *
1350 * the tips serve as a starting set for the work queue.
1351 */
1352 next=*list;
1353 insert = &work;
1354 while (next) {
1355 struct sort_node * node = (struct sort_node *) getter(next->item);
1356
1357 if (node->indegree == 0) {
1358 insert = &commit_list_insert(next->item, insert)->next;
1359 }
1360 next=next->next;
1361 }
1362
1363 /* process the list in topological order */
1364 if (!lifo)
1365 sort_by_date(&work);
1366 while (work) {
1367 struct commit * work_item = pop_commit(&work);
1368 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1369 struct commit_list * parents = work_item->parents;
1370
1371 while (parents) {
1372 struct commit * parent=parents->item;
1373 struct sort_node * pn = (struct sort_node *) getter(parent);
1374
1375 if (pn) {
1376 /*
1377 * parents are only enqueued for emission
1378 * when all their children have been emitted thereby
1379 * guaranteeing topological order.
1380 */
1381 pn->indegree--;
1382 if (!pn->indegree) {
1383 if (!lifo)
1384 insert_by_date(parent, &work);
1385 else
1386 commit_list_insert(parent, &work);
1387 }
1388 }
1389 parents=parents->next;
1390 }
1391 /*
1392 * work_item is a commit all of whose children
1393 * have already been emitted. we can emit it now.
1394 */
1395 *pptr = work_node->list_item;
1396 pptr = &(*pptr)->next;
1397 *pptr = NULL;
1398 setter(work_item, NULL);
1399 }
1400 free(nodes);
1401 }
1402
1403 /* merge-base stuff */
1404
1405 /* bits #0..15 in revision.h */
1406 #define PARENT1 (1u<<16)
1407 #define PARENT2 (1u<<17)
1408 #define STALE (1u<<18)
1409 #define RESULT (1u<<19)
1410
1411 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1412
1413 static struct commit *interesting(struct commit_list *list)
1414 {
1415 while (list) {
1416 struct commit *commit = list->item;
1417 list = list->next;
1418 if (commit->object.flags & STALE)
1419 continue;
1420 return commit;
1421 }
1422 return NULL;
1423 }
1424
1425 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1426 {
1427 struct commit_list *list = NULL;
1428 struct commit_list *result = NULL;
1429
1430 if (one == two)
1431 /* We do not mark this even with RESULT so we do not
1432 * have to clean it up.
1433 */
1434 return commit_list_insert(one, &result);
1435
1436 parse_commit(one);
1437 parse_commit(two);
1438
1439 one->object.flags |= PARENT1;
1440 two->object.flags |= PARENT2;
1441 insert_by_date(one, &list);
1442 insert_by_date(two, &list);
1443
1444 while (interesting(list)) {
1445 struct commit *commit;
1446 struct commit_list *parents;
1447 struct commit_list *n;
1448 int flags;
1449
1450 commit = list->item;
1451 n = list->next;
1452 free(list);
1453 list = n;
1454
1455 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1456 if (flags == (PARENT1 | PARENT2)) {
1457 if (!(commit->object.flags & RESULT)) {
1458 commit->object.flags |= RESULT;
1459 insert_by_date(commit, &result);
1460 }
1461 /* Mark parents of a found merge stale */
1462 flags |= STALE;
1463 }
1464 parents = commit->parents;
1465 while (parents) {
1466 struct commit *p = parents->item;
1467 parents = parents->next;
1468 if ((p->object.flags & flags) == flags)
1469 continue;
1470 parse_commit(p);
1471 p->object.flags |= flags;
1472 insert_by_date(p, &list);
1473 }
1474 }
1475
1476 /* Clean up the result to remove stale ones */
1477 free_commit_list(list);
1478 list = result; result = NULL;
1479 while (list) {
1480 struct commit_list *n = list->next;
1481 if (!(list->item->object.flags & STALE))
1482 insert_by_date(list->item, &result);
1483 free(list);
1484 list = n;
1485 }
1486 return result;
1487 }
1488
1489 struct commit_list *get_merge_bases(struct commit *one,
1490 struct commit *two,
1491 int cleanup)
1492 {
1493 struct commit_list *list;
1494 struct commit **rslt;
1495 struct commit_list *result;
1496 int cnt, i, j;
1497
1498 result = merge_bases(one, two);
1499 if (one == two)
1500 return result;
1501 if (!result || !result->next) {
1502 if (cleanup) {
1503 clear_commit_marks(one, all_flags);
1504 clear_commit_marks(two, all_flags);
1505 }
1506 return result;
1507 }
1508
1509 /* There are more than one */
1510 cnt = 0;
1511 list = result;
1512 while (list) {
1513 list = list->next;
1514 cnt++;
1515 }
1516 rslt = xcalloc(cnt, sizeof(*rslt));
1517 for (list = result, i = 0; list; list = list->next)
1518 rslt[i++] = list->item;
1519 free_commit_list(result);
1520
1521 clear_commit_marks(one, all_flags);
1522 clear_commit_marks(two, all_flags);
1523 for (i = 0; i < cnt - 1; i++) {
1524 for (j = i+1; j < cnt; j++) {
1525 if (!rslt[i] || !rslt[j])
1526 continue;
1527 result = merge_bases(rslt[i], rslt[j]);
1528 clear_commit_marks(rslt[i], all_flags);
1529 clear_commit_marks(rslt[j], all_flags);
1530 for (list = result; list; list = list->next) {
1531 if (rslt[i] == list->item)
1532 rslt[i] = NULL;
1533 if (rslt[j] == list->item)
1534 rslt[j] = NULL;
1535 }
1536 }
1537 }
1538
1539 /* Surviving ones in rslt[] are the independent results */
1540 result = NULL;
1541 for (i = 0; i < cnt; i++) {
1542 if (rslt[i])
1543 insert_by_date(rslt[i], &result);
1544 }
1545 free(rslt);
1546 return result;
1547 }
1548
1549 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1550 {
1551 struct commit_list *bases, *b;
1552 int ret = 0;
1553
1554 if (num == 1)
1555 bases = get_merge_bases(commit, *reference, 1);
1556 else
1557 die("not yet");
1558 for (b = bases; b; b = b->next) {
1559 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1560 ret = 1;
1561 break;
1562 }
1563 }
1564
1565 free_commit_list(bases);
1566 return ret;
1567 }
Miklos' Git tree to make git-merge a builtin.