git.oblomov.eu Git - git/blob - commit.c

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