commit.c

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