?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Add an option to specify a file to config builtin
[git/mergetool.git] / commit.c
blobdc5a0643f3d52797f29706595355fca824d9feda
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 struct commit_list *parents;
445
446 commit->object.flags &= ~mark;
447 parents = commit->parents;
448 while (parents) {
449 struct commit *parent = parents->item;
450
451 /* Have we already cleared this? */
452 if (mark & parent->object.flags)
453 clear_commit_marks(parent, mark);
454 parents = parents->next;
455 }
456 }
457
458 /*
459 * Generic support for pretty-printing the header
460 */
461 static int get_one_line(const char *msg, unsigned long len)
462 {
463 int ret = 0;
464
465 while (len--) {
466 char c = *msg++;
467 if (!c)
468 break;
469 ret++;
470 if (c == '\n')
471 break;
472 }
473 return ret;
474 }
475
476 /* High bit set, or ISO-2022-INT */
477 static int non_ascii(int ch)
478 {
479 ch = (ch & 0xff);
480 return ((ch & 0x80) || (ch == 0x1b));
481 }
482
483 static int is_rfc2047_special(char ch)
484 {
485 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
486 }
487
488 static int add_rfc2047(char *buf, const char *line, int len,
489 const char *encoding)
490 {
491 char *bp = buf;
492 int i, needquote;
493 char q_encoding[128];
494 const char *q_encoding_fmt = "=?%s?q?";
495
496 for (i = needquote = 0; !needquote && i < len; i++) {
497 int ch = line[i];
498 if (non_ascii(ch))
499 needquote++;
500 if ((i + 1 < len) &&
501 (ch == '=' && line[i+1] == '?'))
502 needquote++;
503 }
504 if (!needquote)
505 return sprintf(buf, "%.*s", len, line);
506
507 i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
508 if (sizeof(q_encoding) < i)
509 die("Insanely long encoding name %s", encoding);
510 memcpy(bp, q_encoding, i);
511 bp += i;
512 for (i = 0; i < len; i++) {
513 unsigned ch = line[i] & 0xFF;
514 /*
515 * We encode ' ' using '=20' even though rfc2047
516 * allows using '_' for readability. Unfortunately,
517 * many programs do not understand this and just
518 * leave the underscore in place.
519 */
520 if (is_rfc2047_special(ch) || ch == ' ') {
521 sprintf(bp, "=%02X", ch);
522 bp += 3;
523 }
524 else
525 *bp++ = ch;
526 }
527 memcpy(bp, "?=", 2);
528 bp += 2;
529 return bp - buf;
530 }
531
532 static unsigned long bound_rfc2047(unsigned long len, const char *encoding)
533 {
534 /* upper bound of q encoded string of length 'len' */
535 unsigned long elen = strlen(encoding);
536
537 return len * 3 + elen + 100;
538 }
539
540 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
541 const char *line, enum date_mode dmode,
542 const char *encoding)
543 {
544 char *date;
545 int namelen;
546 unsigned long time;
547 int tz, ret;
548 const char *filler = " ";
549
550 if (fmt == CMIT_FMT_ONELINE)
551 return 0;
552 date = strchr(line, '>');
553 if (!date)
554 return 0;
555 namelen = ++date - line;
556 time = strtoul(date, &date, 10);
557 tz = strtol(date, NULL, 10);
558
559 if (fmt == CMIT_FMT_EMAIL) {
560 char *name_tail = strchr(line, '<');
561 int display_name_length;
562 if (!name_tail)
563 return 0;
564 while (line < name_tail && isspace(name_tail[-1]))
565 name_tail--;
566 display_name_length = name_tail - line;
567 filler = "";
568 strcpy(buf, "From: ");
569 ret = strlen(buf);
570 ret += add_rfc2047(buf + ret, line, display_name_length,
571 encoding);
572 memcpy(buf + ret, name_tail, namelen - display_name_length);
573 ret += namelen - display_name_length;
574 buf[ret++] = '\n';
575 }
576 else {
577 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
578 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
579 filler, namelen, line);
580 }
581 switch (fmt) {
582 case CMIT_FMT_MEDIUM:
583 ret += sprintf(buf + ret, "Date: %s\n",
584 show_date(time, tz, dmode));
585 break;
586 case CMIT_FMT_EMAIL:
587 ret += sprintf(buf + ret, "Date: %s\n",
588 show_date(time, tz, DATE_RFC2822));
589 break;
590 case CMIT_FMT_FULLER:
591 ret += sprintf(buf + ret, "%sDate: %s\n", what,
592 show_date(time, tz, dmode));
593 break;
594 default:
595 /* notin' */
596 break;
597 }
598 return ret;
599 }
600
601 static int is_empty_line(const char *line, int *len_p)
602 {
603 int len = *len_p;
604 while (len && isspace(line[len-1]))
605 len--;
606 *len_p = len;
607 return !len;
608 }
609
610 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
611 {
612 struct commit_list *parent = commit->parents;
613 int offset;
614
615 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
616 !parent || !parent->next)
617 return 0;
618
619 offset = sprintf(buf, "Merge:");
620
621 while (parent) {
622 struct commit *p = parent->item;
623 const char *hex = NULL;
624 const char *dots;
625 if (abbrev)
626 hex = find_unique_abbrev(p->object.sha1, abbrev);
627 if (!hex)
628 hex = sha1_to_hex(p->object.sha1);
629 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
630 parent = parent->next;
631
632 offset += sprintf(buf + offset, " %s%s", hex, dots);
633 }
634 buf[offset++] = '\n';
635 return offset;
636 }
637
638 static char *get_header(const struct commit *commit, const char *key)
639 {
640 int key_len = strlen(key);
641 const char *line = commit->buffer;
642
643 for (;;) {
644 const char *eol = strchr(line, '\n'), *next;
645
646 if (line == eol)
647 return NULL;
648 if (!eol) {
649 eol = line + strlen(line);
650 next = NULL;
651 } else
652 next = eol + 1;
653 if (eol - line > key_len &&
654 !strncmp(line, key, key_len) &&
655 line[key_len] == ' ') {
656 int len = eol - line - key_len;
657 char *ret = xmalloc(len);
658 memcpy(ret, line + key_len + 1, len - 1);
659 ret[len - 1] = '\0';
660 return ret;
661 }
662 line = next;
663 }
664 }
665
666 static char *replace_encoding_header(char *buf, const char *encoding)
667 {
668 char *encoding_header = strstr(buf, "\nencoding ");
669 char *header_end = strstr(buf, "\n\n");
670 char *end_of_encoding_header;
671 int encoding_header_pos;
672 int encoding_header_len;
673 int new_len;
674 int need_len;
675 int buflen = strlen(buf) + 1;
676
677 if (!header_end)
678 header_end = buf + buflen;
679 if (!encoding_header || encoding_header >= header_end)
680 return buf;
681 encoding_header++;
682 end_of_encoding_header = strchr(encoding_header, '\n');
683 if (!end_of_encoding_header)
684 return buf; /* should not happen but be defensive */
685 end_of_encoding_header++;
686
687 encoding_header_len = end_of_encoding_header - encoding_header;
688 encoding_header_pos = encoding_header - buf;
689
690 if (is_encoding_utf8(encoding)) {
691 /* we have re-coded to UTF-8; drop the header */
692 memmove(encoding_header, end_of_encoding_header,
693 buflen - (encoding_header_pos + encoding_header_len));
694 return buf;
695 }
696 new_len = strlen(encoding);
697 need_len = new_len + strlen("encoding \n");
698 if (encoding_header_len < need_len) {
699 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
700 encoding_header = buf + encoding_header_pos;
701 end_of_encoding_header = encoding_header + encoding_header_len;
702 }
703 memmove(end_of_encoding_header + (need_len - encoding_header_len),
704 end_of_encoding_header,
705 buflen - (encoding_header_pos + encoding_header_len));
706 memcpy(encoding_header + 9, encoding, strlen(encoding));
707 encoding_header[9 + new_len] = '\n';
708 return buf;
709 }
710
711 static char *logmsg_reencode(const struct commit *commit,
712 const char *output_encoding)
713 {
714 static const char *utf8 = "utf-8";
715 const char *use_encoding;
716 char *encoding;
717 char *out;
718
719 if (!*output_encoding)
720 return NULL;
721 encoding = get_header(commit, "encoding");
722 use_encoding = encoding ? encoding : utf8;
723 if (!strcmp(use_encoding, output_encoding))
724 if (encoding) /* we'll strip encoding header later */
725 out = xstrdup(commit->buffer);
726 else
727 return NULL; /* nothing to do */
728 else
729 out = reencode_string(commit->buffer,
730 output_encoding, use_encoding);
731 if (out)
732 out = replace_encoding_header(out, output_encoding);
733
734 free(encoding);
735 return out;
736 }
737
738 static void fill_person(struct interp *table, const char *msg, int len)
739 {
740 int start, end, tz = 0;
741 unsigned long date;
742 char *ep;
743
744 /* parse name */
745 for (end = 0; end < len && msg[end] != '<'; end++)
746 ; /* do nothing */
747 start = end + 1;
748 while (end > 0 && isspace(msg[end - 1]))
749 end--;
750 table[0].value = xstrndup(msg, end);
751
752 if (start >= len)
753 return;
754
755 /* parse email */
756 for (end = start + 1; end < len && msg[end] != '>'; end++)
757 ; /* do nothing */
758
759 if (end >= len)
760 return;
761
762 table[1].value = xstrndup(msg + start, end - start);
763
764 /* parse date */
765 for (start = end + 1; start < len && isspace(msg[start]); start++)
766 ; /* do nothing */
767 if (start >= len)
768 return;
769 date = strtoul(msg + start, &ep, 10);
770 if (msg + start == ep)
771 return;
772
773 table[5].value = xstrndup(msg + start, ep - (msg + start));
774
775 /* parse tz */
776 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
777 ; /* do nothing */
778 if (start + 1 < len) {
779 tz = strtoul(msg + start + 1, NULL, 10);
780 if (msg[start] == '-')
781 tz = -tz;
782 }
783
784 interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
785 interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
786 interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
787 interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
788 }
789
790 static long format_commit_message(const struct commit *commit,
791 const char *msg, char **buf_p, unsigned long *space_p)
792 {
793 struct interp table[] = {
794 { "%H" }, /* commit hash */
795 { "%h" }, /* abbreviated commit hash */
796 { "%T" }, /* tree hash */
797 { "%t" }, /* abbreviated tree hash */
798 { "%P" }, /* parent hashes */
799 { "%p" }, /* abbreviated parent hashes */
800 { "%an" }, /* author name */
801 { "%ae" }, /* author email */
802 { "%ad" }, /* author date */
803 { "%aD" }, /* author date, RFC2822 style */
804 { "%ar" }, /* author date, relative */
805 { "%at" }, /* author date, UNIX timestamp */
806 { "%ai" }, /* author date, ISO 8601 */
807 { "%cn" }, /* committer name */
808 { "%ce" }, /* committer email */
809 { "%cd" }, /* committer date */
810 { "%cD" }, /* committer date, RFC2822 style */
811 { "%cr" }, /* committer date, relative */
812 { "%ct" }, /* committer date, UNIX timestamp */
813 { "%ci" }, /* committer date, ISO 8601 */
814 { "%e" }, /* encoding */
815 { "%s" }, /* subject */
816 { "%b" }, /* body */
817 { "%Cred" }, /* red */
818 { "%Cgreen" }, /* green */
819 { "%Cblue" }, /* blue */
820 { "%Creset" }, /* reset color */
821 { "%n" }, /* newline */
822 { "%m" }, /* left/right/bottom */
823 };
824 enum interp_index {
825 IHASH = 0, IHASH_ABBREV,
826 ITREE, ITREE_ABBREV,
827 IPARENTS, IPARENTS_ABBREV,
828 IAUTHOR_NAME, IAUTHOR_EMAIL,
829 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
830 IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
831 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
832 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
833 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
834 ICOMMITTER_ISO8601,
835 IENCODING,
836 ISUBJECT,
837 IBODY,
838 IRED, IGREEN, IBLUE, IRESET_COLOR,
839 INEWLINE,
840 ILEFT_RIGHT,
841 };
842 struct commit_list *p;
843 char parents[1024];
844 int i;
845 enum { HEADER, SUBJECT, BODY } state;
846
847 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
848 die("invalid interp table!");
849
850 /* these are independent of the commit */
851 interp_set_entry(table, IRED, "\033[31m");
852 interp_set_entry(table, IGREEN, "\033[32m");
853 interp_set_entry(table, IBLUE, "\033[34m");
854 interp_set_entry(table, IRESET_COLOR, "\033[m");
855 interp_set_entry(table, INEWLINE, "\n");
856
857 /* these depend on the commit */
858 if (!commit->object.parsed)
859 parse_object(commit->object.sha1);
860 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
861 interp_set_entry(table, IHASH_ABBREV,
862 find_unique_abbrev(commit->object.sha1,
863 DEFAULT_ABBREV));
864 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
865 interp_set_entry(table, ITREE_ABBREV,
866 find_unique_abbrev(commit->tree->object.sha1,
867 DEFAULT_ABBREV));
868 interp_set_entry(table, ILEFT_RIGHT,
869 (commit->object.flags & BOUNDARY)
870 ? "-"
871 : (commit->object.flags & SYMMETRIC_LEFT)
872 ? "<"
873 : ">");
874
875 parents[1] = 0;
876 for (i = 0, p = commit->parents;
877 p && i < sizeof(parents) - 1;
878 p = p->next)
879 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
880 sha1_to_hex(p->item->object.sha1));
881 interp_set_entry(table, IPARENTS, parents + 1);
882
883 parents[1] = 0;
884 for (i = 0, p = commit->parents;
885 p && i < sizeof(parents) - 1;
886 p = p->next)
887 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
888 find_unique_abbrev(p->item->object.sha1,
889 DEFAULT_ABBREV));
890 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
891
892 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
893 int eol;
894 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
895 ; /* do nothing */
896
897 if (state == SUBJECT) {
898 table[ISUBJECT].value = xstrndup(msg + i, eol - i);
899 i = eol;
900 }
901 if (i == eol) {
902 state++;
903 /* strip empty lines */
904 while (msg[eol + 1] == '\n')
905 eol++;
906 } else if (!prefixcmp(msg + i, "author "))
907 fill_person(table + IAUTHOR_NAME,
908 msg + i + 7, eol - i - 7);
909 else if (!prefixcmp(msg + i, "committer "))
910 fill_person(table + ICOMMITTER_NAME,
911 msg + i + 10, eol - i - 10);
912 else if (!prefixcmp(msg + i, "encoding "))
913 table[IENCODING].value =
914 xstrndup(msg + i + 9, eol - i - 9);
915 i = eol;
916 }
917 if (msg[i])
918 table[IBODY].value = xstrdup(msg + i);
919 for (i = 0; i < ARRAY_SIZE(table); i++)
920 if (!table[i].value)
921 interp_set_entry(table, i, "<unknown>");
922
923 do {
924 char *buf = *buf_p;
925 unsigned long space = *space_p;
926
927 space = interpolate(buf, space, user_format,
928 table, ARRAY_SIZE(table));
929 if (!space)
930 break;
931 buf = xrealloc(buf, space);
932 *buf_p = buf;
933 *space_p = space;
934 } while (1);
935 interp_clear_table(table, ARRAY_SIZE(table));
936
937 return strlen(*buf_p);
938 }
939
940 static void pp_header(enum cmit_fmt fmt,
941 int abbrev,
942 enum date_mode dmode,
943 const char *encoding,
944 const struct commit *commit,
945 const char **msg_p,
946 unsigned long *len_p,
947 unsigned long *ofs_p,
948 char **buf_p,
949 unsigned long *space_p)
950 {
951 int parents_shown = 0;
952
953 for (;;) {
954 const char *line = *msg_p;
955 char *dst;
956 int linelen = get_one_line(*msg_p, *len_p);
957 unsigned long len;
958
959 if (!linelen)
960 return;
961 *msg_p += linelen;
962 *len_p -= linelen;
963
964 if (linelen == 1)
965 /* End of header */
966 return;
967
968 ALLOC_GROW(*buf_p, linelen + *ofs_p + 20, *space_p);
969 dst = *buf_p + *ofs_p;
970
971 if (fmt == CMIT_FMT_RAW) {
972 memcpy(dst, line, linelen);
973 *ofs_p += linelen;
974 continue;
975 }
976
977 if (!memcmp(line, "parent ", 7)) {
978 if (linelen != 48)
979 die("bad parent line in commit");
980 continue;
981 }
982
983 if (!parents_shown) {
984 struct commit_list *parent;
985 int num;
986 for (parent = commit->parents, num = 0;
987 parent;
988 parent = parent->next, num++)
989 ;
990 /* with enough slop */
991 num = *ofs_p + num * 50 + 20;
992 ALLOC_GROW(*buf_p, num, *space_p);
993 dst = *buf_p + *ofs_p;
994 *ofs_p += add_merge_info(fmt, dst, commit, abbrev);
995 parents_shown = 1;
996 }
997
998 /*
999 * MEDIUM == DEFAULT shows only author with dates.
1000 * FULL shows both authors but not dates.
1001 * FULLER shows both authors and dates.
1002 */
1003 if (!memcmp(line, "author ", 7)) {
1004 len = linelen;
1005 if (fmt == CMIT_FMT_EMAIL)
1006 len = bound_rfc2047(linelen, encoding);
1007 ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p);
1008 dst = *buf_p + *ofs_p;
1009 *ofs_p += add_user_info("Author", fmt, dst,
1010 line + 7, dmode, encoding);
1011 }
1012
1013 if (!memcmp(line, "committer ", 10) &&
1014 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
1015 len = linelen;
1016 if (fmt == CMIT_FMT_EMAIL)
1017 len = bound_rfc2047(linelen, encoding);
1018 ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p);
1019 dst = *buf_p + *ofs_p;
1020 *ofs_p += add_user_info("Commit", fmt, dst,
1021 line + 10, dmode, encoding);
1022 }
1023 }
1024 }
1025
1026 static void pp_title_line(enum cmit_fmt fmt,
1027 const char **msg_p,
1028 unsigned long *len_p,
1029 unsigned long *ofs_p,
1030 char **buf_p,
1031 unsigned long *space_p,
1032 int indent,
1033 const char *subject,
1034 const char *after_subject,
1035 const char *encoding,
1036 int plain_non_ascii)
1037 {
1038 char *title;
1039 unsigned long title_alloc, title_len;
1040 unsigned long len;
1041
1042 title_len = 0;
1043 title_alloc = 80;
1044 title = xmalloc(title_alloc);
1045 for (;;) {
1046 const char *line = *msg_p;
1047 int linelen = get_one_line(line, *len_p);
1048 *msg_p += linelen;
1049 *len_p -= linelen;
1050
1051 if (!linelen || is_empty_line(line, &linelen))
1052 break;
1053
1054 if (title_alloc <= title_len + linelen + 2) {
1055 title_alloc = title_len + linelen + 80;
1056 title = xrealloc(title, title_alloc);
1057 }
1058 len = 0;
1059 if (title_len) {
1060 if (fmt == CMIT_FMT_EMAIL) {
1061 len++;
1062 title[title_len++] = '\n';
1063 }
1064 len++;
1065 title[title_len++] = ' ';
1066 }
1067 memcpy(title + title_len, line, linelen);
1068 title_len += linelen;
1069 }
1070
1071 /* Enough slop for the MIME header and rfc2047 */
1072 len = bound_rfc2047(title_len, encoding)+ 1000;
1073 if (subject)
1074 len += strlen(subject);
1075 if (after_subject)
1076 len += strlen(after_subject);
1077 if (encoding)
1078 len += strlen(encoding);
1079 ALLOC_GROW(*buf_p, title_len + *ofs_p + len, *space_p);
1080
1081 if (subject) {
1082 len = strlen(subject);
1083 memcpy(*buf_p + *ofs_p, subject, len);
1084 *ofs_p += len;
1085 *ofs_p += add_rfc2047(*buf_p + *ofs_p,
1086 title, title_len, encoding);
1087 } else {
1088 memcpy(*buf_p + *ofs_p, title, title_len);
1089 *ofs_p += title_len;
1090 }
1091 (*buf_p)[(*ofs_p)++] = '\n';
1092 if (plain_non_ascii) {
1093 const char *header_fmt =
1094 "MIME-Version: 1.0\n"
1095 "Content-Type: text/plain; charset=%s\n"
1096 "Content-Transfer-Encoding: 8bit\n";
1097 *ofs_p += snprintf(*buf_p + *ofs_p,
1098 *space_p - *ofs_p,
1099 header_fmt, encoding);
1100 }
1101 if (after_subject) {
1102 len = strlen(after_subject);
1103 memcpy(*buf_p + *ofs_p, after_subject, len);
1104 *ofs_p += len;
1105 }
1106 free(title);
1107 if (fmt == CMIT_FMT_EMAIL) {
1108 ALLOC_GROW(*buf_p, *ofs_p + 20, *space_p);
1109 (*buf_p)[(*ofs_p)++] = '\n';
1110 }
1111 }
1112
1113 static void pp_remainder(enum cmit_fmt fmt,
1114 const char **msg_p,
1115 unsigned long *len_p,
1116 unsigned long *ofs_p,
1117 char **buf_p,
1118 unsigned long *space_p,
1119 int indent)
1120 {
1121 int first = 1;
1122 for (;;) {
1123 const char *line = *msg_p;
1124 int linelen = get_one_line(line, *len_p);
1125 *msg_p += linelen;
1126 *len_p -= linelen;
1127
1128 if (!linelen)
1129 break;
1130
1131 if (is_empty_line(line, &linelen)) {
1132 if (first)
1133 continue;
1134 if (fmt == CMIT_FMT_SHORT)
1135 break;
1136 }
1137 first = 0;
1138
1139 ALLOC_GROW(*buf_p, *ofs_p + linelen + indent + 20, *space_p);
1140 if (indent) {
1141 memset(*buf_p + *ofs_p, ' ', indent);
1142 *ofs_p += indent;
1143 }
1144 memcpy(*buf_p + *ofs_p, line, linelen);
1145 *ofs_p += linelen;
1146 (*buf_p)[(*ofs_p)++] = '\n';
1147 }
1148 }
1149
1150 unsigned long pretty_print_commit(enum cmit_fmt fmt,
1151 const struct commit *commit,
1152 unsigned long len,
1153 char **buf_p, unsigned long *space_p,
1154 int abbrev, const char *subject,
1155 const char *after_subject,
1156 enum date_mode dmode)
1157 {
1158 unsigned long offset = 0;
1159 unsigned long beginning_of_body;
1160 int indent = 4;
1161 const char *msg = commit->buffer;
1162 int plain_non_ascii = 0;
1163 char *reencoded;
1164 const char *encoding;
1165 char *buf;
1166
1167 if (fmt == CMIT_FMT_USERFORMAT)
1168 return format_commit_message(commit, msg, buf_p, space_p);
1169
1170 encoding = (git_log_output_encoding
1171 ? git_log_output_encoding
1172 : git_commit_encoding);
1173 if (!encoding)
1174 encoding = "utf-8";
1175 reencoded = logmsg_reencode(commit, encoding);
1176 if (reencoded) {
1177 msg = reencoded;
1178 len = strlen(reencoded);
1179 }
1180
1181 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1182 indent = 0;
1183
1184 /* After-subject is used to pass in Content-Type: multipart
1185 * MIME header; in that case we do not have to do the
1186 * plaintext content type even if the commit message has
1187 * non 7-bit ASCII character. Otherwise, check if we need
1188 * to say this is not a 7-bit ASCII.
1189 */
1190 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
1191 int i, ch, in_body;
1192
1193 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
1194 if (!in_body) {
1195 /* author could be non 7-bit ASCII but
1196 * the log may be so; skip over the
1197 * header part first.
1198 */
1199 if (ch == '\n' &&
1200 i + 1 < len && msg[i+1] == '\n')
1201 in_body = 1;
1202 }
1203 else if (non_ascii(ch)) {
1204 plain_non_ascii = 1;
1205 break;
1206 }
1207 }
1208 }
1209
1210 pp_header(fmt, abbrev, dmode, encoding,
1211 commit, &msg, &len,
1212 &offset, buf_p, space_p);
1213 if (fmt != CMIT_FMT_ONELINE && !subject) {
1214 ALLOC_GROW(*buf_p, offset + 20, *space_p);
1215 (*buf_p)[offset++] = '\n';
1216 }
1217
1218 /* Skip excess blank lines at the beginning of body, if any... */
1219 for (;;) {
1220 int linelen = get_one_line(msg, len);
1221 int ll = linelen;
1222 if (!linelen)
1223 break;
1224 if (!is_empty_line(msg, &ll))
1225 break;
1226 msg += linelen;
1227 len -= linelen;
1228 }
1229
1230 /* These formats treat the title line specially. */
1231 if (fmt == CMIT_FMT_ONELINE
1232 || fmt == CMIT_FMT_EMAIL)
1233 pp_title_line(fmt, &msg, &len, &offset,
1234 buf_p, space_p, indent,
1235 subject, after_subject, encoding,
1236 plain_non_ascii);
1237
1238 beginning_of_body = offset;
1239 if (fmt != CMIT_FMT_ONELINE)
1240 pp_remainder(fmt, &msg, &len, &offset,
1241 buf_p, space_p, indent);
1242
1243 while (offset && isspace((*buf_p)[offset-1]))
1244 offset--;
1245
1246 ALLOC_GROW(*buf_p, offset + 20, *space_p);
1247 buf = *buf_p;
1248
1249 /* Make sure there is an EOLN for the non-oneline case */
1250 if (fmt != CMIT_FMT_ONELINE)
1251 buf[offset++] = '\n';
1252
1253 /*
1254 * The caller may append additional body text in e-mail
1255 * format. Make sure we did not strip the blank line
1256 * between the header and the body.
1257 */
1258 if (fmt == CMIT_FMT_EMAIL && offset <= beginning_of_body)
1259 buf[offset++] = '\n';
1260 buf[offset] = '\0';
1261 free(reencoded);
1262 return offset;
1263 }
1264
1265 struct commit *pop_commit(struct commit_list **stack)
1266 {
1267 struct commit_list *top = *stack;
1268 struct commit *item = top ? top->item : NULL;
1269
1270 if (top) {
1271 *stack = top->next;
1272 free(top);
1273 }
1274 return item;
1275 }
1276
1277 void topo_sort_default_setter(struct commit *c, void *data)
1278 {
1279 c->util = data;
1280 }
1281
1282 void *topo_sort_default_getter(struct commit *c)
1283 {
1284 return c->util;
1285 }
1286
1287 /*
1288 * Performs an in-place topological sort on the list supplied.
1289 */
1290 void sort_in_topological_order(struct commit_list ** list, int lifo)
1291 {
1292 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1293 topo_sort_default_getter);
1294 }
1295
1296 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1297 topo_sort_set_fn_t setter,
1298 topo_sort_get_fn_t getter)
1299 {
1300 struct commit_list * next = *list;
1301 struct commit_list * work = NULL, **insert;
1302 struct commit_list ** pptr = list;
1303 struct sort_node * nodes;
1304 struct sort_node * next_nodes;
1305 int count = 0;
1306
1307 /* determine the size of the list */
1308 while (next) {
1309 next = next->next;
1310 count++;
1311 }
1312
1313 if (!count)
1314 return;
1315 /* allocate an array to help sort the list */
1316 nodes = xcalloc(count, sizeof(*nodes));
1317 /* link the list to the array */
1318 next_nodes = nodes;
1319 next=*list;
1320 while (next) {
1321 next_nodes->list_item = next;
1322 setter(next->item, next_nodes);
1323 next_nodes++;
1324 next = next->next;
1325 }
1326 /* update the indegree */
1327 next=*list;
1328 while (next) {
1329 struct commit_list * parents = next->item->parents;
1330 while (parents) {
1331 struct commit * parent=parents->item;
1332 struct sort_node * pn = (struct sort_node *) getter(parent);
1333
1334 if (pn)
1335 pn->indegree++;
1336 parents=parents->next;
1337 }
1338 next=next->next;
1339 }
1340 /*
1341 * find the tips
1342 *
1343 * tips are nodes not reachable from any other node in the list
1344 *
1345 * the tips serve as a starting set for the work queue.
1346 */
1347 next=*list;
1348 insert = &work;
1349 while (next) {
1350 struct sort_node * node = (struct sort_node *) getter(next->item);
1351
1352 if (node->indegree == 0) {
1353 insert = &commit_list_insert(next->item, insert)->next;
1354 }
1355 next=next->next;
1356 }
1357
1358 /* process the list in topological order */
1359 if (!lifo)
1360 sort_by_date(&work);
1361 while (work) {
1362 struct commit * work_item = pop_commit(&work);
1363 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1364 struct commit_list * parents = work_item->parents;
1365
1366 while (parents) {
1367 struct commit * parent=parents->item;
1368 struct sort_node * pn = (struct sort_node *) getter(parent);
1369
1370 if (pn) {
1371 /*
1372 * parents are only enqueued for emission
1373 * when all their children have been emitted thereby
1374 * guaranteeing topological order.
1375 */
1376 pn->indegree--;
1377 if (!pn->indegree) {
1378 if (!lifo)
1379 insert_by_date(parent, &work);
1380 else
1381 commit_list_insert(parent, &work);
1382 }
1383 }
1384 parents=parents->next;
1385 }
1386 /*
1387 * work_item is a commit all of whose children
1388 * have already been emitted. we can emit it now.
1389 */
1390 *pptr = work_node->list_item;
1391 pptr = &(*pptr)->next;
1392 *pptr = NULL;
1393 setter(work_item, NULL);
1394 }
1395 free(nodes);
1396 }
1397
1398 /* merge-base stuff */
1399
1400 /* bits #0..15 in revision.h */
1401 #define PARENT1 (1u<<16)
1402 #define PARENT2 (1u<<17)
1403 #define STALE (1u<<18)
1404 #define RESULT (1u<<19)
1405
1406 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1407
1408 static struct commit *interesting(struct commit_list *list)
1409 {
1410 while (list) {
1411 struct commit *commit = list->item;
1412 list = list->next;
1413 if (commit->object.flags & STALE)
1414 continue;
1415 return commit;
1416 }
1417 return NULL;
1418 }
1419
1420 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1421 {
1422 struct commit_list *list = NULL;
1423 struct commit_list *result = NULL;
1424
1425 if (one == two)
1426 /* We do not mark this even with RESULT so we do not
1427 * have to clean it up.
1428 */
1429 return commit_list_insert(one, &result);
1430
1431 parse_commit(one);
1432 parse_commit(two);
1433
1434 one->object.flags |= PARENT1;
1435 two->object.flags |= PARENT2;
1436 insert_by_date(one, &list);
1437 insert_by_date(two, &list);
1438
1439 while (interesting(list)) {
1440 struct commit *commit;
1441 struct commit_list *parents;
1442 struct commit_list *n;
1443 int flags;
1444
1445 commit = list->item;
1446 n = list->next;
1447 free(list);
1448 list = n;
1449
1450 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1451 if (flags == (PARENT1 | PARENT2)) {
1452 if (!(commit->object.flags & RESULT)) {
1453 commit->object.flags |= RESULT;
1454 insert_by_date(commit, &result);
1455 }
1456 /* Mark parents of a found merge stale */
1457 flags |= STALE;
1458 }
1459 parents = commit->parents;
1460 while (parents) {
1461 struct commit *p = parents->item;
1462 parents = parents->next;
1463 if ((p->object.flags & flags) == flags)
1464 continue;
1465 parse_commit(p);
1466 p->object.flags |= flags;
1467 insert_by_date(p, &list);
1468 }
1469 }
1470
1471 /* Clean up the result to remove stale ones */
1472 free_commit_list(list);
1473 list = result; result = NULL;
1474 while (list) {
1475 struct commit_list *n = list->next;
1476 if (!(list->item->object.flags & STALE))
1477 insert_by_date(list->item, &result);
1478 free(list);
1479 list = n;
1480 }
1481 return result;
1482 }
1483
1484 struct commit_list *get_merge_bases(struct commit *one,
1485 struct commit *two,
1486 int cleanup)
1487 {
1488 struct commit_list *list;
1489 struct commit **rslt;
1490 struct commit_list *result;
1491 int cnt, i, j;
1492
1493 result = merge_bases(one, two);
1494 if (one == two)
1495 return result;
1496 if (!result || !result->next) {
1497 if (cleanup) {
1498 clear_commit_marks(one, all_flags);
1499 clear_commit_marks(two, all_flags);
1500 }
1501 return result;
1502 }
1503
1504 /* There are more than one */
1505 cnt = 0;
1506 list = result;
1507 while (list) {
1508 list = list->next;
1509 cnt++;
1510 }
1511 rslt = xcalloc(cnt, sizeof(*rslt));
1512 for (list = result, i = 0; list; list = list->next)
1513 rslt[i++] = list->item;
1514 free_commit_list(result);
1515
1516 clear_commit_marks(one, all_flags);
1517 clear_commit_marks(two, all_flags);
1518 for (i = 0; i < cnt - 1; i++) {
1519 for (j = i+1; j < cnt; j++) {
1520 if (!rslt[i] || !rslt[j])
1521 continue;
1522 result = merge_bases(rslt[i], rslt[j]);
1523 clear_commit_marks(rslt[i], all_flags);
1524 clear_commit_marks(rslt[j], all_flags);
1525 for (list = result; list; list = list->next) {
1526 if (rslt[i] == list->item)
1527 rslt[i] = NULL;
1528 if (rslt[j] == list->item)
1529 rslt[j] = NULL;
1530 }
1531 }
1532 }
1533
1534 /* Surviving ones in rslt[] are the independent results */
1535 result = NULL;
1536 for (i = 0; i < cnt; i++) {
1537 if (rslt[i])
1538 insert_by_date(rslt[i], &result);
1539 }
1540 free(rslt);
1541 return result;
1542 }
1543
1544 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1545 {
1546 struct commit_list *bases, *b;
1547 int ret = 0;
1548
1549 if (num == 1)
1550 bases = get_merge_bases(commit, *reference, 1);
1551 else
1552 die("not yet");
1553 for (b = bases; b; b = b->next) {
1554 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1555 ret = 1;
1556 break;
1557 }
1558 }
1559
1560 free_commit_list(bases);
1561 return ret;
1562 }
Git mergetool