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