7 int save_commit_buffer = 1;
12 * the number of children of the associated commit
13 * that also occur in the list being sorted.
15 unsigned int indegree;
18 * reference to original list item that we will re-use
21 struct commit_list * list_item;
25 const char *commit_type = "commit";
32 { "raw", 1, CMIT_FMT_RAW },
33 { "medium", 1, CMIT_FMT_MEDIUM },
34 { "short", 1, CMIT_FMT_SHORT },
35 { "email", 1, CMIT_FMT_EMAIL },
36 { "full", 5, CMIT_FMT_FULL },
37 { "fuller", 5, CMIT_FMT_FULLER },
38 { "oneline", 1, CMIT_FMT_ONELINE },
41 enum cmit_fmt get_commit_format(const char *arg)
46 return CMIT_FMT_DEFAULT;
49 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
50 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
51 !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
55 die("invalid --pretty format: %s", arg);
58 static struct commit *check_commit(struct object *obj,
59 const unsigned char *sha1,
62 if (obj->type != OBJ_COMMIT) {
64 error("Object %s is a %s, not a commit",
65 sha1_to_hex(sha1), typename(obj->type));
68 return (struct commit *) obj;
71 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
74 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
78 return check_commit(obj, sha1, quiet);
81 struct commit *lookup_commit_reference(const unsigned char *sha1)
83 return lookup_commit_reference_gently(sha1, 0);
86 struct commit *lookup_commit(const unsigned char *sha1)
88 struct object *obj = lookup_object(sha1);
90 struct commit *ret = alloc_commit_node();
91 created_object(sha1, &ret->object);
92 ret->object.type = OBJ_COMMIT;
96 obj->type = OBJ_COMMIT;
97 return check_commit(obj, sha1, 0);
100 static unsigned long parse_commit_date(const char *buf)
104 if (memcmp(buf, "author", 6))
106 while (*buf++ != '\n')
108 if (memcmp(buf, "committer", 9))
110 while (*buf++ != '>')
112 date = strtoul(buf, NULL, 10);
113 if (date == ULONG_MAX)
118 static struct commit_graft **commit_graft;
119 static int commit_graft_alloc, commit_graft_nr;
121 static int commit_graft_pos(const unsigned char *sha1)
125 hi = commit_graft_nr;
127 int mi = (lo + hi) / 2;
128 struct commit_graft *graft = commit_graft[mi];
129 int cmp = hashcmp(sha1, graft->sha1);
140 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
142 int pos = commit_graft_pos(graft->sha1);
148 free(commit_graft[pos]);
149 commit_graft[pos] = graft;
154 if (commit_graft_alloc <= ++commit_graft_nr) {
155 commit_graft_alloc = alloc_nr(commit_graft_alloc);
156 commit_graft = xrealloc(commit_graft,
157 sizeof(*commit_graft) *
160 if (pos < commit_graft_nr)
161 memmove(commit_graft + pos + 1,
163 (commit_graft_nr - pos - 1) *
164 sizeof(*commit_graft));
165 commit_graft[pos] = graft;
169 struct commit_graft *read_graft_line(char *buf, int len)
171 /* The format is just "Commit Parent1 Parent2 ...\n" */
173 struct commit_graft *graft = NULL;
175 if (buf[len-1] == '\n')
177 if (buf[0] == '#' || buf[0] == '\0')
179 if ((len + 1) % 41) {
181 error("bad graft data: %s", buf);
185 i = (len + 1) / 41 - 1;
186 graft = xmalloc(sizeof(*graft) + 20 * i);
187 graft->nr_parent = i;
188 if (get_sha1_hex(buf, graft->sha1))
190 for (i = 40; i < len; i += 41) {
193 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
199 int read_graft_file(const char *graft_file)
201 FILE *fp = fopen(graft_file, "r");
205 while (fgets(buf, sizeof(buf), fp)) {
206 /* The format is just "Commit Parent1 Parent2 ...\n" */
207 int len = strlen(buf);
208 struct commit_graft *graft = read_graft_line(buf, len);
211 if (register_commit_graft(graft, 1))
212 error("duplicate graft data: %s", buf);
218 static void prepare_commit_graft(void)
220 static int commit_graft_prepared;
223 if (commit_graft_prepared)
225 graft_file = get_graft_file();
226 read_graft_file(graft_file);
227 /* make sure shallows are read */
228 is_repository_shallow();
229 commit_graft_prepared = 1;
232 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
235 prepare_commit_graft();
236 pos = commit_graft_pos(sha1);
239 return commit_graft[pos];
242 int write_shallow_commits(int fd, int use_pack_protocol)
245 for (i = 0; i < commit_graft_nr; i++)
246 if (commit_graft[i]->nr_parent < 0) {
248 sha1_to_hex(commit_graft[i]->sha1);
250 if (use_pack_protocol)
251 packet_write(fd, "shallow %s", hex);
253 if (write_in_full(fd, hex, 40) != 40)
255 if (write_in_full(fd, "\n", 1) != 1)
262 int unregister_shallow(const unsigned char *sha1)
264 int pos = commit_graft_pos(sha1);
267 if (pos + 1 < commit_graft_nr)
268 memcpy(commit_graft + pos, commit_graft + pos + 1,
269 sizeof(struct commit_graft *)
270 * (commit_graft_nr - pos - 1));
275 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
278 char *bufptr = buffer;
279 unsigned char parent[20];
280 struct commit_list **pptr;
281 struct commit_graft *graft;
284 if (item->object.parsed)
286 item->object.parsed = 1;
288 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
289 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
290 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
291 return error("bad tree pointer in commit %s",
292 sha1_to_hex(item->object.sha1));
293 item->tree = lookup_tree(parent);
296 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
297 pptr = &item->parents;
299 graft = lookup_commit_graft(item->object.sha1);
300 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
301 struct commit *new_parent;
303 if (tail <= bufptr + 48 ||
304 get_sha1_hex(bufptr + 7, parent) ||
306 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
310 new_parent = lookup_commit(parent);
312 pptr = &commit_list_insert(new_parent, pptr)->next;
318 struct commit *new_parent;
319 for (i = 0; i < graft->nr_parent; i++) {
320 new_parent = lookup_commit(graft->parent[i]);
323 pptr = &commit_list_insert(new_parent, pptr)->next;
327 item->date = parse_commit_date(bufptr);
329 if (track_object_refs) {
331 struct commit_list *p;
332 struct object_refs *refs = alloc_object_refs(n_refs);
334 refs->ref[i++] = &item->tree->object;
335 for (p = item->parents; p; p = p->next)
336 refs->ref[i++] = &p->item->object;
337 set_object_refs(&item->object, refs);
343 int parse_commit(struct commit *item)
350 if (item->object.parsed)
352 buffer = read_sha1_file(item->object.sha1, type, &size);
354 return error("Could not read %s",
355 sha1_to_hex(item->object.sha1));
356 if (strcmp(type, commit_type)) {
358 return error("Object %s not a commit",
359 sha1_to_hex(item->object.sha1));
361 ret = parse_commit_buffer(item, buffer, size);
362 if (save_commit_buffer && !ret) {
363 item->buffer = buffer;
370 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
372 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
373 new_list->item = item;
374 new_list->next = *list_p;
379 void free_commit_list(struct commit_list *list)
382 struct commit_list *temp = list;
388 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
390 struct commit_list **pp = list;
391 struct commit_list *p;
392 while ((p = *pp) != NULL) {
393 if (p->item->date < item->date) {
398 return commit_list_insert(item, pp);
402 void sort_by_date(struct commit_list **list)
404 struct commit_list *ret = NULL;
406 insert_by_date((*list)->item, &ret);
407 *list = (*list)->next;
412 struct commit *pop_most_recent_commit(struct commit_list **list,
415 struct commit *ret = (*list)->item;
416 struct commit_list *parents = ret->parents;
417 struct commit_list *old = *list;
419 *list = (*list)->next;
423 struct commit *commit = parents->item;
424 parse_commit(commit);
425 if (!(commit->object.flags & mark)) {
426 commit->object.flags |= mark;
427 insert_by_date(commit, list);
429 parents = parents->next;
434 void clear_commit_marks(struct commit *commit, unsigned int mark)
436 struct commit_list *parents;
438 commit->object.flags &= ~mark;
439 parents = commit->parents;
441 struct commit *parent = parents->item;
443 /* Have we already cleared this? */
444 if (mark & parent->object.flags)
445 clear_commit_marks(parent, mark);
446 parents = parents->next;
451 * Generic support for pretty-printing the header
453 static int get_one_line(const char *msg, unsigned long len)
468 /* High bit set, or ISO-2022-INT */
469 static int non_ascii(int ch)
472 return ((ch & 0x80) || (ch == 0x1b));
475 static int is_rfc2047_special(char ch)
477 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
480 static int add_rfc2047(char *buf, const char *line, int len,
481 const char *encoding)
485 char q_encoding[128];
486 const char *q_encoding_fmt = "=?%s?q?";
488 for (i = needquote = 0; !needquote && i < len; i++) {
493 (ch == '=' && line[i+1] == '?'))
497 return sprintf(buf, "%.*s", len, line);
499 i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
500 if (sizeof(q_encoding) < i)
501 die("Insanely long encoding name %s", encoding);
502 memcpy(bp, q_encoding, i);
504 for (i = 0; i < len; i++) {
505 unsigned ch = line[i] & 0xFF;
506 if (is_rfc2047_special(ch)) {
507 sprintf(bp, "=%02X", ch);
520 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
521 const char *line, int relative_date,
522 const char *encoding)
528 const char *filler = " ";
530 if (fmt == CMIT_FMT_ONELINE)
532 date = strchr(line, '>');
535 namelen = ++date - line;
536 time = strtoul(date, &date, 10);
537 tz = strtol(date, NULL, 10);
539 if (fmt == CMIT_FMT_EMAIL) {
540 char *name_tail = strchr(line, '<');
541 int display_name_length;
544 while (line < name_tail && isspace(name_tail[-1]))
546 display_name_length = name_tail - line;
548 strcpy(buf, "From: ");
550 ret += add_rfc2047(buf + ret, line, display_name_length,
552 memcpy(buf + ret, name_tail, namelen - display_name_length);
553 ret += namelen - display_name_length;
557 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
558 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
559 filler, namelen, line);
562 case CMIT_FMT_MEDIUM:
563 ret += sprintf(buf + ret, "Date: %s\n",
564 show_date(time, tz, relative_date));
567 ret += sprintf(buf + ret, "Date: %s\n",
568 show_rfc2822_date(time, tz));
570 case CMIT_FMT_FULLER:
571 ret += sprintf(buf + ret, "%sDate: %s\n", what,
572 show_date(time, tz, relative_date));
581 static int is_empty_line(const char *line, int *len_p)
584 while (len && isspace(line[len-1]))
590 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
592 struct commit_list *parent = commit->parents;
595 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
596 !parent || !parent->next)
599 offset = sprintf(buf, "Merge:");
602 struct commit *p = parent->item;
603 const char *hex = NULL;
606 hex = find_unique_abbrev(p->object.sha1, abbrev);
608 hex = sha1_to_hex(p->object.sha1);
609 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
610 parent = parent->next;
612 offset += sprintf(buf + offset, " %s%s", hex, dots);
614 buf[offset++] = '\n';
618 static char *get_header(const struct commit *commit, const char *key)
620 int key_len = strlen(key);
621 const char *line = commit->buffer;
624 const char *eol = strchr(line, '\n'), *next;
629 eol = line + strlen(line);
633 if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
634 int len = eol - line - key_len;
635 char *ret = xmalloc(len);
636 memcpy(ret, line + key_len + 1, len - 1);
644 static char *replace_encoding_header(char *buf, char *encoding)
646 char *encoding_header = strstr(buf, "\nencoding ");
647 char *header_end = strstr(buf, "\n\n");
648 char *end_of_encoding_header;
649 int encoding_header_pos;
650 int encoding_header_len;
653 int buflen = strlen(buf) + 1;
656 header_end = buf + buflen;
657 if (!encoding_header || encoding_header >= header_end)
660 end_of_encoding_header = strchr(encoding_header, '\n');
661 if (!end_of_encoding_header)
662 return buf; /* should not happen but be defensive */
663 end_of_encoding_header++;
665 encoding_header_len = end_of_encoding_header - encoding_header;
666 encoding_header_pos = encoding_header - buf;
668 if (is_encoding_utf8(encoding)) {
669 /* we have re-coded to UTF-8; drop the header */
670 memmove(encoding_header, end_of_encoding_header,
671 buflen - (encoding_header_pos + encoding_header_len));
674 new_len = strlen(encoding);
675 need_len = new_len + strlen("encoding \n");
676 if (encoding_header_len < need_len) {
677 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
678 encoding_header = buf + encoding_header_pos;
679 end_of_encoding_header = encoding_header + encoding_header_len;
681 memmove(end_of_encoding_header + (need_len - encoding_header_len),
682 end_of_encoding_header,
683 buflen - (encoding_header_pos + encoding_header_len));
684 memcpy(encoding_header + 9, encoding, strlen(encoding));
685 encoding_header[9 + new_len] = '\n';
689 static char *logmsg_reencode(const struct commit *commit,
690 char *output_encoding)
694 char *utf8 = "utf-8";
696 if (!*output_encoding)
698 encoding = get_header(commit, "encoding");
701 if (!strcmp(encoding, output_encoding))
702 out = strdup(commit->buffer);
704 out = reencode_string(commit->buffer,
705 output_encoding, encoding);
707 out = replace_encoding_header(out, output_encoding);
709 if (encoding != utf8)
716 unsigned long pretty_print_commit(enum cmit_fmt fmt,
717 const struct commit *commit,
719 char *buf, unsigned long space,
720 int abbrev, const char *subject,
721 const char *after_subject,
724 int hdr = 1, body = 0, seen_title = 0;
725 unsigned long offset = 0;
727 int parents_shown = 0;
728 const char *msg = commit->buffer;
729 int plain_non_ascii = 0;
733 encoding = (git_log_output_encoding
734 ? git_log_output_encoding
735 : git_commit_encoding);
738 reencoded = logmsg_reencode(commit, encoding);
742 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
745 /* After-subject is used to pass in Content-Type: multipart
746 * MIME header; in that case we do not have to do the
747 * plaintext content type even if the commit message has
748 * non 7-bit ASCII character. Otherwise, check if we need
749 * to say this is not a 7-bit ASCII.
751 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
754 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
756 /* author could be non 7-bit ASCII but
757 * the log may be so; skip over the
761 i + 1 < len && msg[i+1] == '\n')
764 else if (non_ascii(ch)) {
772 const char *line = msg;
773 int linelen = get_one_line(msg, len);
779 * We want some slop for indentation and a possible
780 * final "...". Thus the "+ 20".
782 if (offset + linelen + 20 > space) {
783 memcpy(buf + offset, " ...\n", 8);
793 if ((fmt != CMIT_FMT_ONELINE) && !subject)
794 buf[offset++] = '\n';
797 if (fmt == CMIT_FMT_RAW) {
798 memcpy(buf + offset, line, linelen);
802 if (!memcmp(line, "parent ", 7)) {
804 die("bad parent line in commit");
808 if (!parents_shown) {
809 offset += add_merge_info(fmt, buf + offset,
815 * MEDIUM == DEFAULT shows only author with dates.
816 * FULL shows both authors but not dates.
817 * FULLER shows both authors and dates.
819 if (!memcmp(line, "author ", 7))
820 offset += add_user_info("Author", fmt,
825 if (!memcmp(line, "committer ", 10) &&
826 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
827 offset += add_user_info("Commit", fmt,
838 if (is_empty_line(line, &linelen)) {
845 if (fmt == CMIT_FMT_SHORT)
851 int slen = strlen(subject);
852 memcpy(buf + offset, subject, slen);
854 offset += add_rfc2047(buf + offset, line, linelen,
858 memset(buf + offset, ' ', indent);
859 memcpy(buf + offset + indent, line, linelen);
860 offset += linelen + indent;
862 buf[offset++] = '\n';
863 if (fmt == CMIT_FMT_ONELINE)
865 if (subject && plain_non_ascii) {
868 const char *header_fmt =
869 "Content-Type: text/plain; charset=%s\n"
870 "Content-Transfer-Encoding: 8bit\n";
871 sz = snprintf(header, sizeof(header), header_fmt,
873 if (sizeof(header) < sz)
874 die("Encoding name %s too long", encoding);
875 memcpy(buf + offset, header, sz);
879 int slen = strlen(after_subject);
880 if (slen > space - offset - 1)
881 slen = space - offset - 1;
882 memcpy(buf + offset, after_subject, slen);
884 after_subject = NULL;
888 while (offset && isspace(buf[offset-1]))
890 /* Make sure there is an EOLN for the non-oneline case */
891 if (fmt != CMIT_FMT_ONELINE)
892 buf[offset++] = '\n';
894 * make sure there is another EOLN to separate the headers from whatever
895 * body the caller appends if we haven't already written a body
897 if (fmt == CMIT_FMT_EMAIL && !body)
898 buf[offset++] = '\n';
905 struct commit *pop_commit(struct commit_list **stack)
907 struct commit_list *top = *stack;
908 struct commit *item = top ? top->item : NULL;
917 int count_parents(struct commit * commit)
920 struct commit_list * parents = commit->parents;
921 for (count = 0; parents; parents = parents->next,count++)
926 void topo_sort_default_setter(struct commit *c, void *data)
931 void *topo_sort_default_getter(struct commit *c)
937 * Performs an in-place topological sort on the list supplied.
939 void sort_in_topological_order(struct commit_list ** list, int lifo)
941 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
942 topo_sort_default_getter);
945 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
946 topo_sort_set_fn_t setter,
947 topo_sort_get_fn_t getter)
949 struct commit_list * next = *list;
950 struct commit_list * work = NULL, **insert;
951 struct commit_list ** pptr = list;
952 struct sort_node * nodes;
953 struct sort_node * next_nodes;
956 /* determine the size of the list */
964 /* allocate an array to help sort the list */
965 nodes = xcalloc(count, sizeof(*nodes));
966 /* link the list to the array */
970 next_nodes->list_item = next;
971 setter(next->item, next_nodes);
975 /* update the indegree */
978 struct commit_list * parents = next->item->parents;
980 struct commit * parent=parents->item;
981 struct sort_node * pn = (struct sort_node *) getter(parent);
985 parents=parents->next;
992 * tips are nodes not reachable from any other node in the list
994 * the tips serve as a starting set for the work queue.
999 struct sort_node * node = (struct sort_node *) getter(next->item);
1001 if (node->indegree == 0) {
1002 insert = &commit_list_insert(next->item, insert)->next;
1007 /* process the list in topological order */
1009 sort_by_date(&work);
1011 struct commit * work_item = pop_commit(&work);
1012 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1013 struct commit_list * parents = work_item->parents;
1016 struct commit * parent=parents->item;
1017 struct sort_node * pn = (struct sort_node *) getter(parent);
1021 * parents are only enqueued for emission
1022 * when all their children have been emitted thereby
1023 * guaranteeing topological order.
1026 if (!pn->indegree) {
1028 insert_by_date(parent, &work);
1030 commit_list_insert(parent, &work);
1033 parents=parents->next;
1036 * work_item is a commit all of whose children
1037 * have already been emitted. we can emit it now.
1039 *pptr = work_node->list_item;
1040 pptr = &(*pptr)->next;
1042 setter(work_item, NULL);
1047 /* merge-base stuff */
1049 /* bits #0..15 in revision.h */
1050 #define PARENT1 (1u<<16)
1051 #define PARENT2 (1u<<17)
1052 #define STALE (1u<<18)
1053 #define RESULT (1u<<19)
1055 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1057 static struct commit *interesting(struct commit_list *list)
1060 struct commit *commit = list->item;
1062 if (commit->object.flags & STALE)
1069 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1071 struct commit_list *list = NULL;
1072 struct commit_list *result = NULL;
1075 /* We do not mark this even with RESULT so we do not
1076 * have to clean it up.
1078 return commit_list_insert(one, &result);
1083 one->object.flags |= PARENT1;
1084 two->object.flags |= PARENT2;
1085 insert_by_date(one, &list);
1086 insert_by_date(two, &list);
1088 while (interesting(list)) {
1089 struct commit *commit;
1090 struct commit_list *parents;
1091 struct commit_list *n;
1094 commit = list->item;
1099 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1100 if (flags == (PARENT1 | PARENT2)) {
1101 if (!(commit->object.flags & RESULT)) {
1102 commit->object.flags |= RESULT;
1103 insert_by_date(commit, &result);
1105 /* Mark parents of a found merge stale */
1108 parents = commit->parents;
1110 struct commit *p = parents->item;
1111 parents = parents->next;
1112 if ((p->object.flags & flags) == flags)
1115 p->object.flags |= flags;
1116 insert_by_date(p, &list);
1120 /* Clean up the result to remove stale ones */
1121 free_commit_list(list);
1122 list = result; result = NULL;
1124 struct commit_list *n = list->next;
1125 if (!(list->item->object.flags & STALE))
1126 insert_by_date(list->item, &result);
1133 struct commit_list *get_merge_bases(struct commit *one,
1137 struct commit_list *list;
1138 struct commit **rslt;
1139 struct commit_list *result;
1142 result = merge_bases(one, two);
1145 if (!result || !result->next) {
1147 clear_commit_marks(one, all_flags);
1148 clear_commit_marks(two, all_flags);
1153 /* There are more than one */
1160 rslt = xcalloc(cnt, sizeof(*rslt));
1161 for (list = result, i = 0; list; list = list->next)
1162 rslt[i++] = list->item;
1163 free_commit_list(result);
1165 clear_commit_marks(one, all_flags);
1166 clear_commit_marks(two, all_flags);
1167 for (i = 0; i < cnt - 1; i++) {
1168 for (j = i+1; j < cnt; j++) {
1169 if (!rslt[i] || !rslt[j])
1171 result = merge_bases(rslt[i], rslt[j]);
1172 clear_commit_marks(rslt[i], all_flags);
1173 clear_commit_marks(rslt[j], all_flags);
1174 for (list = result; list; list = list->next) {
1175 if (rslt[i] == list->item)
1177 if (rslt[j] == list->item)
1183 /* Surviving ones in rslt[] are the independent results */
1185 for (i = 0; i < cnt; i++) {
1187 insert_by_date(rslt[i], &result);
1193 int in_merge_bases(struct commit *rev1, struct commit *rev2)
1195 struct commit_list *bases, *b;
1198 bases = get_merge_bases(rev1, rev2, 1);
1199 for (b = bases; b; b = b->next) {
1200 if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) {
1206 free_commit_list(bases);