builtin-commit.con commit Merge branch 'bg/rebase-reword' (e79999b)
   1/*
   2 * Builtin "git commit"
   3 *
   4 * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
   5 * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
   6 */
   7
   8#include "cache.h"
   9#include "cache-tree.h"
  10#include "color.h"
  11#include "dir.h"
  12#include "builtin.h"
  13#include "diff.h"
  14#include "diffcore.h"
  15#include "commit.h"
  16#include "revision.h"
  17#include "wt-status.h"
  18#include "run-command.h"
  19#include "refs.h"
  20#include "log-tree.h"
  21#include "strbuf.h"
  22#include "utf8.h"
  23#include "parse-options.h"
  24#include "string-list.h"
  25#include "rerere.h"
  26#include "unpack-trees.h"
  27
  28static const char * const builtin_commit_usage[] = {
  29        "git commit [options] [--] <filepattern>...",
  30        NULL
  31};
  32
  33static const char * const builtin_status_usage[] = {
  34        "git status [options] [--] <filepattern>...",
  35        NULL
  36};
  37
  38static unsigned char head_sha1[20], merge_head_sha1[20];
  39static char *use_message_buffer;
  40static const char commit_editmsg[] = "COMMIT_EDITMSG";
  41static struct lock_file index_lock; /* real index */
  42static struct lock_file false_lock; /* used only for partial commits */
  43static enum {
  44        COMMIT_AS_IS = 1,
  45        COMMIT_NORMAL,
  46        COMMIT_PARTIAL,
  47} commit_style;
  48
  49static const char *logfile, *force_author;
  50static const char *template_file;
  51static char *edit_message, *use_message;
  52static char *author_name, *author_email, *author_date;
  53static int all, edit_flag, also, interactive, only, amend, signoff;
  54static int quiet, verbose, no_verify, allow_empty, dry_run;
  55static char *untracked_files_arg;
  56/*
  57 * The default commit message cleanup mode will remove the lines
  58 * beginning with # (shell comments) and leading and trailing
  59 * whitespaces (empty lines or containing only whitespaces)
  60 * if editor is used, and only the whitespaces if the message
  61 * is specified explicitly.
  62 */
  63static enum {
  64        CLEANUP_SPACE,
  65        CLEANUP_NONE,
  66        CLEANUP_ALL,
  67} cleanup_mode;
  68static char *cleanup_arg;
  69
  70static int use_editor = 1, initial_commit, in_merge;
  71static const char *only_include_assumed;
  72static struct strbuf message;
  73
  74static int opt_parse_m(const struct option *opt, const char *arg, int unset)
  75{
  76        struct strbuf *buf = opt->value;
  77        if (unset)
  78                strbuf_setlen(buf, 0);
  79        else {
  80                strbuf_addstr(buf, arg);
  81                strbuf_addstr(buf, "\n\n");
  82        }
  83        return 0;
  84}
  85
  86static struct option builtin_commit_options[] = {
  87        OPT__QUIET(&quiet),
  88        OPT__VERBOSE(&verbose),
  89        OPT_GROUP("Commit message options"),
  90
  91        OPT_FILENAME('F', "file", &logfile, "read log from file"),
  92        OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
  93        OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
  94        OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
  95        OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
  96        OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
  97        OPT_FILENAME('t', "template", &template_file, "use specified template file"),
  98        OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
  99
 100        OPT_GROUP("Commit contents options"),
 101        OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
 102        OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
 103        OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
 104        OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
 105        OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
 106        OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
 107        OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
 108        { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
 109        OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
 110        OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
 111
 112        OPT_END()
 113};
 114
 115static void rollback_index_files(void)
 116{
 117        switch (commit_style) {
 118        case COMMIT_AS_IS:
 119                break; /* nothing to do */
 120        case COMMIT_NORMAL:
 121                rollback_lock_file(&index_lock);
 122                break;
 123        case COMMIT_PARTIAL:
 124                rollback_lock_file(&index_lock);
 125                rollback_lock_file(&false_lock);
 126                break;
 127        }
 128}
 129
 130static int commit_index_files(void)
 131{
 132        int err = 0;
 133
 134        switch (commit_style) {
 135        case COMMIT_AS_IS:
 136                break; /* nothing to do */
 137        case COMMIT_NORMAL:
 138                err = commit_lock_file(&index_lock);
 139                break;
 140        case COMMIT_PARTIAL:
 141                err = commit_lock_file(&index_lock);
 142                rollback_lock_file(&false_lock);
 143                break;
 144        }
 145
 146        return err;
 147}
 148
 149/*
 150 * Take a union of paths in the index and the named tree (typically, "HEAD"),
 151 * and return the paths that match the given pattern in list.
 152 */
 153static int list_paths(struct string_list *list, const char *with_tree,
 154                      const char *prefix, const char **pattern)
 155{
 156        int i;
 157        char *m;
 158
 159        for (i = 0; pattern[i]; i++)
 160                ;
 161        m = xcalloc(1, i);
 162
 163        if (with_tree)
 164                overlay_tree_on_cache(with_tree, prefix);
 165
 166        for (i = 0; i < active_nr; i++) {
 167                struct cache_entry *ce = active_cache[i];
 168                if (ce->ce_flags & CE_UPDATE)
 169                        continue;
 170                if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
 171                        continue;
 172                string_list_insert(ce->name, list);
 173        }
 174
 175        return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
 176}
 177
 178static void add_remove_files(struct string_list *list)
 179{
 180        int i;
 181        for (i = 0; i < list->nr; i++) {
 182                struct stat st;
 183                struct string_list_item *p = &(list->items[i]);
 184
 185                if (!lstat(p->string, &st)) {
 186                        if (add_to_cache(p->string, &st, 0))
 187                                die("updating files failed");
 188                } else
 189                        remove_file_from_cache(p->string);
 190        }
 191}
 192
 193static void create_base_index(void)
 194{
 195        struct tree *tree;
 196        struct unpack_trees_options opts;
 197        struct tree_desc t;
 198
 199        if (initial_commit) {
 200                discard_cache();
 201                return;
 202        }
 203
 204        memset(&opts, 0, sizeof(opts));
 205        opts.head_idx = 1;
 206        opts.index_only = 1;
 207        opts.merge = 1;
 208        opts.src_index = &the_index;
 209        opts.dst_index = &the_index;
 210
 211        opts.fn = oneway_merge;
 212        tree = parse_tree_indirect(head_sha1);
 213        if (!tree)
 214                die("failed to unpack HEAD tree object");
 215        parse_tree(tree);
 216        init_tree_desc(&t, tree->buffer, tree->size);
 217        if (unpack_trees(1, &t, &opts))
 218                exit(128); /* We've already reported the error, finish dying */
 219}
 220
 221static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status)
 222{
 223        int fd;
 224        struct string_list partial;
 225        const char **pathspec = NULL;
 226        int refresh_flags = REFRESH_QUIET;
 227
 228        if (is_status)
 229                refresh_flags |= REFRESH_UNMERGED;
 230        if (interactive) {
 231                if (interactive_add(argc, argv, prefix) != 0)
 232                        die("interactive add failed");
 233                if (read_cache_preload(NULL) < 0)
 234                        die("index file corrupt");
 235                commit_style = COMMIT_AS_IS;
 236                return get_index_file();
 237        }
 238
 239        if (*argv)
 240                pathspec = get_pathspec(prefix, argv);
 241
 242        if (read_cache_preload(pathspec) < 0)
 243                die("index file corrupt");
 244
 245        /*
 246         * Non partial, non as-is commit.
 247         *
 248         * (1) get the real index;
 249         * (2) update the_index as necessary;
 250         * (3) write the_index out to the real index (still locked);
 251         * (4) return the name of the locked index file.
 252         *
 253         * The caller should run hooks on the locked real index, and
 254         * (A) if all goes well, commit the real index;
 255         * (B) on failure, rollback the real index.
 256         */
 257        if (all || (also && pathspec && *pathspec)) {
 258                int fd = hold_locked_index(&index_lock, 1);
 259                add_files_to_cache(also ? prefix : NULL, pathspec, 0);
 260                refresh_cache(refresh_flags);
 261                if (write_cache(fd, active_cache, active_nr) ||
 262                    close_lock_file(&index_lock))
 263                        die("unable to write new_index file");
 264                commit_style = COMMIT_NORMAL;
 265                return index_lock.filename;
 266        }
 267
 268        /*
 269         * As-is commit.
 270         *
 271         * (1) return the name of the real index file.
 272         *
 273         * The caller should run hooks on the real index, and run
 274         * hooks on the real index, and create commit from the_index.
 275         * We still need to refresh the index here.
 276         */
 277        if (!pathspec || !*pathspec) {
 278                fd = hold_locked_index(&index_lock, 1);
 279                refresh_cache(refresh_flags);
 280                if (write_cache(fd, active_cache, active_nr) ||
 281                    commit_locked_index(&index_lock))
 282                        die("unable to write new_index file");
 283                commit_style = COMMIT_AS_IS;
 284                return get_index_file();
 285        }
 286
 287        /*
 288         * A partial commit.
 289         *
 290         * (0) find the set of affected paths;
 291         * (1) get lock on the real index file;
 292         * (2) update the_index with the given paths;
 293         * (3) write the_index out to the real index (still locked);
 294         * (4) get lock on the false index file;
 295         * (5) reset the_index from HEAD;
 296         * (6) update the_index the same way as (2);
 297         * (7) write the_index out to the false index file;
 298         * (8) return the name of the false index file (still locked);
 299         *
 300         * The caller should run hooks on the locked false index, and
 301         * create commit from it.  Then
 302         * (A) if all goes well, commit the real index;
 303         * (B) on failure, rollback the real index;
 304         * In either case, rollback the false index.
 305         */
 306        commit_style = COMMIT_PARTIAL;
 307
 308        if (file_exists(git_path("MERGE_HEAD")))
 309                die("cannot do a partial commit during a merge.");
 310
 311        memset(&partial, 0, sizeof(partial));
 312        partial.strdup_strings = 1;
 313        if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
 314                exit(1);
 315
 316        discard_cache();
 317        if (read_cache() < 0)
 318                die("cannot read the index");
 319
 320        fd = hold_locked_index(&index_lock, 1);
 321        add_remove_files(&partial);
 322        refresh_cache(REFRESH_QUIET);
 323        if (write_cache(fd, active_cache, active_nr) ||
 324            close_lock_file(&index_lock))
 325                die("unable to write new_index file");
 326
 327        fd = hold_lock_file_for_update(&false_lock,
 328                                       git_path("next-index-%"PRIuMAX,
 329                                                (uintmax_t) getpid()),
 330                                       LOCK_DIE_ON_ERROR);
 331
 332        create_base_index();
 333        add_remove_files(&partial);
 334        refresh_cache(REFRESH_QUIET);
 335
 336        if (write_cache(fd, active_cache, active_nr) ||
 337            close_lock_file(&false_lock))
 338                die("unable to write temporary index file");
 339
 340        discard_cache();
 341        read_cache_from(false_lock.filename);
 342
 343        return false_lock.filename;
 344}
 345
 346static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
 347                      struct wt_status *s)
 348{
 349        if (s->relative_paths)
 350                s->prefix = prefix;
 351
 352        if (amend) {
 353                s->amend = 1;
 354                s->reference = "HEAD^1";
 355        }
 356        s->verbose = verbose;
 357        s->index_file = index_file;
 358        s->fp = fp;
 359        s->nowarn = nowarn;
 360
 361        wt_status_print(s);
 362
 363        return s->commitable;
 364}
 365
 366static int is_a_merge(const unsigned char *sha1)
 367{
 368        struct commit *commit = lookup_commit(sha1);
 369        if (!commit || parse_commit(commit))
 370                die("could not parse HEAD commit");
 371        return !!(commit->parents && commit->parents->next);
 372}
 373
 374static const char sign_off_header[] = "Signed-off-by: ";
 375
 376static void determine_author_info(void)
 377{
 378        char *name, *email, *date;
 379
 380        name = getenv("GIT_AUTHOR_NAME");
 381        email = getenv("GIT_AUTHOR_EMAIL");
 382        date = getenv("GIT_AUTHOR_DATE");
 383
 384        if (use_message) {
 385                const char *a, *lb, *rb, *eol;
 386
 387                a = strstr(use_message_buffer, "\nauthor ");
 388                if (!a)
 389                        die("invalid commit: %s", use_message);
 390
 391                lb = strstr(a + 8, " <");
 392                rb = strstr(a + 8, "> ");
 393                eol = strchr(a + 8, '\n');
 394                if (!lb || !rb || !eol)
 395                        die("invalid commit: %s", use_message);
 396
 397                name = xstrndup(a + 8, lb - (a + 8));
 398                email = xstrndup(lb + 2, rb - (lb + 2));
 399                date = xstrndup(rb + 2, eol - (rb + 2));
 400        }
 401
 402        if (force_author) {
 403                const char *lb = strstr(force_author, " <");
 404                const char *rb = strchr(force_author, '>');
 405
 406                if (!lb || !rb)
 407                        die("malformed --author parameter");
 408                name = xstrndup(force_author, lb - force_author);
 409                email = xstrndup(lb + 2, rb - (lb + 2));
 410        }
 411
 412        author_name = name;
 413        author_email = email;
 414        author_date = date;
 415}
 416
 417static int prepare_to_commit(const char *index_file, const char *prefix,
 418                             struct wt_status *s)
 419{
 420        struct stat statbuf;
 421        int commitable, saved_color_setting;
 422        struct strbuf sb = STRBUF_INIT;
 423        char *buffer;
 424        FILE *fp;
 425        const char *hook_arg1 = NULL;
 426        const char *hook_arg2 = NULL;
 427        int ident_shown = 0;
 428
 429        if (!no_verify && run_hook(index_file, "pre-commit", NULL))
 430                return 0;
 431
 432        if (message.len) {
 433                strbuf_addbuf(&sb, &message);
 434                hook_arg1 = "message";
 435        } else if (logfile && !strcmp(logfile, "-")) {
 436                if (isatty(0))
 437                        fprintf(stderr, "(reading log message from standard input)\n");
 438                if (strbuf_read(&sb, 0, 0) < 0)
 439                        die_errno("could not read log from standard input");
 440                hook_arg1 = "message";
 441        } else if (logfile) {
 442                if (strbuf_read_file(&sb, logfile, 0) < 0)
 443                        die_errno("could not read log file '%s'",
 444                                  logfile);
 445                hook_arg1 = "message";
 446        } else if (use_message) {
 447                buffer = strstr(use_message_buffer, "\n\n");
 448                if (!buffer || buffer[2] == '\0')
 449                        die("commit has empty message");
 450                strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
 451                hook_arg1 = "commit";
 452                hook_arg2 = use_message;
 453        } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
 454                if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
 455                        die_errno("could not read MERGE_MSG");
 456                hook_arg1 = "merge";
 457        } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
 458                if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
 459                        die_errno("could not read SQUASH_MSG");
 460                hook_arg1 = "squash";
 461        } else if (template_file && !stat(template_file, &statbuf)) {
 462                if (strbuf_read_file(&sb, template_file, 0) < 0)
 463                        die_errno("could not read '%s'", template_file);
 464                hook_arg1 = "template";
 465        }
 466
 467        /*
 468         * This final case does not modify the template message,
 469         * it just sets the argument to the prepare-commit-msg hook.
 470         */
 471        else if (in_merge)
 472                hook_arg1 = "merge";
 473
 474        fp = fopen(git_path(commit_editmsg), "w");
 475        if (fp == NULL)
 476                die_errno("could not open '%s'", git_path(commit_editmsg));
 477
 478        if (cleanup_mode != CLEANUP_NONE)
 479                stripspace(&sb, 0);
 480
 481        if (signoff) {
 482                struct strbuf sob = STRBUF_INIT;
 483                int i;
 484
 485                strbuf_addstr(&sob, sign_off_header);
 486                strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
 487                                             getenv("GIT_COMMITTER_EMAIL")));
 488                strbuf_addch(&sob, '\n');
 489                for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
 490                        ; /* do nothing */
 491                if (prefixcmp(sb.buf + i, sob.buf)) {
 492                        if (prefixcmp(sb.buf + i, sign_off_header))
 493                                strbuf_addch(&sb, '\n');
 494                        strbuf_addbuf(&sb, &sob);
 495                }
 496                strbuf_release(&sob);
 497        }
 498
 499        if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
 500                die_errno("could not write commit template");
 501
 502        strbuf_release(&sb);
 503
 504        determine_author_info();
 505
 506        /* This checks if committer ident is explicitly given */
 507        git_committer_info(0);
 508        if (use_editor) {
 509                char *author_ident;
 510                const char *committer_ident;
 511
 512                if (in_merge)
 513                        fprintf(fp,
 514                                "#\n"
 515                                "# It looks like you may be committing a MERGE.\n"
 516                                "# If this is not correct, please remove the file\n"
 517                                "#      %s\n"
 518                                "# and try again.\n"
 519                                "#\n",
 520                                git_path("MERGE_HEAD"));
 521
 522                fprintf(fp,
 523                        "\n"
 524                        "# Please enter the commit message for your changes.");
 525                if (cleanup_mode == CLEANUP_ALL)
 526                        fprintf(fp,
 527                                " Lines starting\n"
 528                                "# with '#' will be ignored, and an empty"
 529                                " message aborts the commit.\n");
 530                else /* CLEANUP_SPACE, that is. */
 531                        fprintf(fp,
 532                                " Lines starting\n"
 533                                "# with '#' will be kept; you may remove them"
 534                                " yourself if you want to.\n"
 535                                "# An empty message aborts the commit.\n");
 536                if (only_include_assumed)
 537                        fprintf(fp, "# %s\n", only_include_assumed);
 538
 539                author_ident = xstrdup(fmt_name(author_name, author_email));
 540                committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"),
 541                                           getenv("GIT_COMMITTER_EMAIL"));
 542                if (strcmp(author_ident, committer_ident))
 543                        fprintf(fp,
 544                                "%s"
 545                                "# Author:    %s\n",
 546                                ident_shown++ ? "" : "#\n",
 547                                author_ident);
 548                free(author_ident);
 549
 550                if (!user_ident_explicitly_given)
 551                        fprintf(fp,
 552                                "%s"
 553                                "# Committer: %s\n",
 554                                ident_shown++ ? "" : "#\n",
 555                                committer_ident);
 556
 557                if (ident_shown)
 558                        fprintf(fp, "#\n");
 559
 560                saved_color_setting = s->use_color;
 561                s->use_color = 0;
 562                commitable = run_status(fp, index_file, prefix, 1, s);
 563                s->use_color = saved_color_setting;
 564        } else {
 565                unsigned char sha1[20];
 566                const char *parent = "HEAD";
 567
 568                if (!active_nr && read_cache() < 0)
 569                        die("Cannot read index");
 570
 571                if (amend)
 572                        parent = "HEAD^1";
 573
 574                if (get_sha1(parent, sha1))
 575                        commitable = !!active_nr;
 576                else
 577                        commitable = index_differs_from(parent, 0);
 578        }
 579
 580        fclose(fp);
 581
 582        if (!commitable && !in_merge && !allow_empty &&
 583            !(amend && is_a_merge(head_sha1))) {
 584                run_status(stdout, index_file, prefix, 0, s);
 585                return 0;
 586        }
 587
 588        /*
 589         * Re-read the index as pre-commit hook could have updated it,
 590         * and write it out as a tree.  We must do this before we invoke
 591         * the editor and after we invoke run_status above.
 592         */
 593        discard_cache();
 594        read_cache_from(index_file);
 595        if (!active_cache_tree)
 596                active_cache_tree = cache_tree();
 597        if (cache_tree_update(active_cache_tree,
 598                              active_cache, active_nr, 0, 0) < 0) {
 599                error("Error building trees");
 600                return 0;
 601        }
 602
 603        if (run_hook(index_file, "prepare-commit-msg",
 604                     git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
 605                return 0;
 606
 607        if (use_editor) {
 608                char index[PATH_MAX];
 609                const char *env[2] = { index, NULL };
 610                snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
 611                if (launch_editor(git_path(commit_editmsg), NULL, env)) {
 612                        fprintf(stderr,
 613                        "Please supply the message using either -m or -F option.\n");
 614                        exit(1);
 615                }
 616        }
 617
 618        if (!no_verify &&
 619            run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
 620                return 0;
 621        }
 622
 623        return 1;
 624}
 625
 626/*
 627 * Find out if the message in the strbuf contains only whitespace and
 628 * Signed-off-by lines.
 629 */
 630static int message_is_empty(struct strbuf *sb)
 631{
 632        struct strbuf tmpl = STRBUF_INIT;
 633        const char *nl;
 634        int eol, i, start = 0;
 635
 636        if (cleanup_mode == CLEANUP_NONE && sb->len)
 637                return 0;
 638
 639        /* See if the template is just a prefix of the message. */
 640        if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
 641                stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
 642                if (start + tmpl.len <= sb->len &&
 643                    memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
 644                        start += tmpl.len;
 645        }
 646        strbuf_release(&tmpl);
 647
 648        /* Check if the rest is just whitespace and Signed-of-by's. */
 649        for (i = start; i < sb->len; i++) {
 650                nl = memchr(sb->buf + i, '\n', sb->len - i);
 651                if (nl)
 652                        eol = nl - sb->buf;
 653                else
 654                        eol = sb->len;
 655
 656                if (strlen(sign_off_header) <= eol - i &&
 657                    !prefixcmp(sb->buf + i, sign_off_header)) {
 658                        i = eol;
 659                        continue;
 660                }
 661                while (i < eol)
 662                        if (!isspace(sb->buf[i++]))
 663                                return 0;
 664        }
 665
 666        return 1;
 667}
 668
 669static const char *find_author_by_nickname(const char *name)
 670{
 671        struct rev_info revs;
 672        struct commit *commit;
 673        struct strbuf buf = STRBUF_INIT;
 674        const char *av[20];
 675        int ac = 0;
 676
 677        init_revisions(&revs, NULL);
 678        strbuf_addf(&buf, "--author=%s", name);
 679        av[++ac] = "--all";
 680        av[++ac] = "-i";
 681        av[++ac] = buf.buf;
 682        av[++ac] = NULL;
 683        setup_revisions(ac, av, &revs, NULL);
 684        prepare_revision_walk(&revs);
 685        commit = get_revision(&revs);
 686        if (commit) {
 687                strbuf_release(&buf);
 688                format_commit_message(commit, "%an <%ae>", &buf, DATE_NORMAL);
 689                return strbuf_detach(&buf, NULL);
 690        }
 691        die("No existing author found with '%s'", name);
 692}
 693
 694static int parse_and_validate_options(int argc, const char *argv[],
 695                                      const char * const usage[],
 696                                      const char *prefix,
 697                                      struct wt_status *s)
 698{
 699        int f = 0;
 700
 701        argc = parse_options(argc, argv, prefix, builtin_commit_options, usage,
 702                             0);
 703
 704        if (force_author && !strchr(force_author, '>'))
 705                force_author = find_author_by_nickname(force_author);
 706
 707        if (logfile || message.len || use_message)
 708                use_editor = 0;
 709        if (edit_flag)
 710                use_editor = 1;
 711        if (!use_editor)
 712                setenv("GIT_EDITOR", ":", 1);
 713
 714        if (get_sha1("HEAD", head_sha1))
 715                initial_commit = 1;
 716
 717        if (!get_sha1("MERGE_HEAD", merge_head_sha1))
 718                in_merge = 1;
 719
 720        /* Sanity check options */
 721        if (amend && initial_commit)
 722                die("You have nothing to amend.");
 723        if (amend && in_merge)
 724                die("You are in the middle of a merge -- cannot amend.");
 725
 726        if (use_message)
 727                f++;
 728        if (edit_message)
 729                f++;
 730        if (logfile)
 731                f++;
 732        if (f > 1)
 733                die("Only one of -c/-C/-F can be used.");
 734        if (message.len && f > 0)
 735                die("Option -m cannot be combined with -c/-C/-F.");
 736        if (edit_message)
 737                use_message = edit_message;
 738        if (amend && !use_message)
 739                use_message = "HEAD";
 740        if (use_message) {
 741                unsigned char sha1[20];
 742                static char utf8[] = "UTF-8";
 743                const char *out_enc;
 744                char *enc, *end;
 745                struct commit *commit;
 746
 747                if (get_sha1(use_message, sha1))
 748                        die("could not lookup commit %s", use_message);
 749                commit = lookup_commit_reference(sha1);
 750                if (!commit || parse_commit(commit))
 751                        die("could not parse commit %s", use_message);
 752
 753                enc = strstr(commit->buffer, "\nencoding");
 754                if (enc) {
 755                        end = strchr(enc + 10, '\n');
 756                        enc = xstrndup(enc + 10, end - (enc + 10));
 757                } else {
 758                        enc = utf8;
 759                }
 760                out_enc = git_commit_encoding ? git_commit_encoding : utf8;
 761
 762                if (strcmp(out_enc, enc))
 763                        use_message_buffer =
 764                                reencode_string(commit->buffer, out_enc, enc);
 765
 766                /*
 767                 * If we failed to reencode the buffer, just copy it
 768                 * byte for byte so the user can try to fix it up.
 769                 * This also handles the case where input and output
 770                 * encodings are identical.
 771                 */
 772                if (use_message_buffer == NULL)
 773                        use_message_buffer = xstrdup(commit->buffer);
 774                if (enc != utf8)
 775                        free(enc);
 776        }
 777
 778        if (!!also + !!only + !!all + !!interactive > 1)
 779                die("Only one of --include/--only/--all/--interactive can be used.");
 780        if (argc == 0 && (also || (only && !amend)))
 781                die("No paths with --include/--only does not make sense.");
 782        if (argc == 0 && only && amend)
 783                only_include_assumed = "Clever... amending the last one with dirty index.";
 784        if (argc > 0 && !also && !only)
 785                only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
 786        if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
 787                cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
 788        else if (!strcmp(cleanup_arg, "verbatim"))
 789                cleanup_mode = CLEANUP_NONE;
 790        else if (!strcmp(cleanup_arg, "whitespace"))
 791                cleanup_mode = CLEANUP_SPACE;
 792        else if (!strcmp(cleanup_arg, "strip"))
 793                cleanup_mode = CLEANUP_ALL;
 794        else
 795                die("Invalid cleanup mode %s", cleanup_arg);
 796
 797        if (!untracked_files_arg)
 798                ; /* default already initialized */
 799        else if (!strcmp(untracked_files_arg, "no"))
 800                s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
 801        else if (!strcmp(untracked_files_arg, "normal"))
 802                s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 803        else if (!strcmp(untracked_files_arg, "all"))
 804                s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
 805        else
 806                die("Invalid untracked files mode '%s'", untracked_files_arg);
 807
 808        if (all && argc > 0)
 809                die("Paths with -a does not make sense.");
 810        else if (interactive && argc > 0)
 811                die("Paths with --interactive does not make sense.");
 812
 813        return argc;
 814}
 815
 816static int dry_run_commit(int argc, const char **argv, const char *prefix,
 817                          struct wt_status *s)
 818{
 819        int commitable;
 820        const char *index_file;
 821
 822        index_file = prepare_index(argc, argv, prefix, 1);
 823        commitable = run_status(stdout, index_file, prefix, 0, s);
 824        rollback_index_files();
 825
 826        return commitable ? 0 : 1;
 827}
 828
 829static int parse_status_slot(const char *var, int offset)
 830{
 831        if (!strcasecmp(var+offset, "header"))
 832                return WT_STATUS_HEADER;
 833        if (!strcasecmp(var+offset, "updated")
 834                || !strcasecmp(var+offset, "added"))
 835                return WT_STATUS_UPDATED;
 836        if (!strcasecmp(var+offset, "changed"))
 837                return WT_STATUS_CHANGED;
 838        if (!strcasecmp(var+offset, "untracked"))
 839                return WT_STATUS_UNTRACKED;
 840        if (!strcasecmp(var+offset, "nobranch"))
 841                return WT_STATUS_NOBRANCH;
 842        if (!strcasecmp(var+offset, "unmerged"))
 843                return WT_STATUS_UNMERGED;
 844        die("bad config variable '%s'", var);
 845}
 846
 847static int git_status_config(const char *k, const char *v, void *cb)
 848{
 849        struct wt_status *s = cb;
 850
 851        if (!strcmp(k, "status.submodulesummary")) {
 852                int is_bool;
 853                s->submodule_summary = git_config_bool_or_int(k, v, &is_bool);
 854                if (is_bool && s->submodule_summary)
 855                        s->submodule_summary = -1;
 856                return 0;
 857        }
 858        if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
 859                s->use_color = git_config_colorbool(k, v, -1);
 860                return 0;
 861        }
 862        if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
 863                int slot = parse_status_slot(k, 13);
 864                if (!v)
 865                        return config_error_nonbool(k);
 866                color_parse(v, k, s->color_palette[slot]);
 867                return 0;
 868        }
 869        if (!strcmp(k, "status.relativepaths")) {
 870                s->relative_paths = git_config_bool(k, v);
 871                return 0;
 872        }
 873        if (!strcmp(k, "status.showuntrackedfiles")) {
 874                if (!v)
 875                        return config_error_nonbool(k);
 876                else if (!strcmp(v, "no"))
 877                        s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
 878                else if (!strcmp(v, "normal"))
 879                        s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 880                else if (!strcmp(v, "all"))
 881                        s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
 882                else
 883                        return error("Invalid untracked files mode '%s'", v);
 884                return 0;
 885        }
 886        return git_diff_ui_config(k, v, NULL);
 887}
 888
 889int cmd_status(int argc, const char **argv, const char *prefix)
 890{
 891        struct wt_status s;
 892
 893        wt_status_prepare(&s);
 894        git_config(git_status_config, &s);
 895        if (s.use_color == -1)
 896                s.use_color = git_use_color_default;
 897        if (diff_use_color_default == -1)
 898                diff_use_color_default = git_use_color_default;
 899
 900        argc = parse_and_validate_options(argc, argv, builtin_status_usage,
 901                                          prefix, &s);
 902        return dry_run_commit(argc, argv, prefix, &s);
 903}
 904
 905static void print_summary(const char *prefix, const unsigned char *sha1)
 906{
 907        struct rev_info rev;
 908        struct commit *commit;
 909        static const char *format = "format:%h] %s";
 910        unsigned char junk_sha1[20];
 911        const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
 912
 913        commit = lookup_commit(sha1);
 914        if (!commit)
 915                die("couldn't look up newly created commit");
 916        if (!commit || parse_commit(commit))
 917                die("could not parse newly created commit");
 918
 919        init_revisions(&rev, prefix);
 920        setup_revisions(0, NULL, &rev, NULL);
 921
 922        rev.abbrev = 0;
 923        rev.diff = 1;
 924        rev.diffopt.output_format =
 925                DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
 926
 927        rev.verbose_header = 1;
 928        rev.show_root_diff = 1;
 929        get_commit_format(format, &rev);
 930        rev.always_show_header = 0;
 931        rev.diffopt.detect_rename = 1;
 932        rev.diffopt.rename_limit = 100;
 933        rev.diffopt.break_opt = 0;
 934        diff_setup_done(&rev.diffopt);
 935
 936        printf("[%s%s ",
 937                !prefixcmp(head, "refs/heads/") ?
 938                        head + 11 :
 939                        !strcmp(head, "HEAD") ?
 940                                "detached HEAD" :
 941                                head,
 942                initial_commit ? " (root-commit)" : "");
 943
 944        if (!log_tree_commit(&rev, commit)) {
 945                struct strbuf buf = STRBUF_INIT;
 946                format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
 947                printf("%s\n", buf.buf);
 948                strbuf_release(&buf);
 949        }
 950}
 951
 952static int git_commit_config(const char *k, const char *v, void *cb)
 953{
 954        struct wt_status *s = cb;
 955
 956        if (!strcmp(k, "commit.template"))
 957                return git_config_string(&template_file, k, v);
 958
 959        return git_status_config(k, v, s);
 960}
 961
 962int cmd_commit(int argc, const char **argv, const char *prefix)
 963{
 964        struct strbuf sb = STRBUF_INIT;
 965        const char *index_file, *reflog_msg;
 966        char *nl, *p;
 967        unsigned char commit_sha1[20];
 968        struct ref_lock *ref_lock;
 969        struct commit_list *parents = NULL, **pptr = &parents;
 970        struct stat statbuf;
 971        int allow_fast_forward = 1;
 972        struct wt_status s;
 973
 974        wt_status_prepare(&s);
 975        git_config(git_commit_config, &s);
 976
 977        if (s.use_color == -1)
 978                s.use_color = git_use_color_default;
 979
 980        argc = parse_and_validate_options(argc, argv, builtin_commit_usage,
 981                                          prefix, &s);
 982        if (dry_run) {
 983                if (diff_use_color_default == -1)
 984                        diff_use_color_default = git_use_color_default;
 985                return dry_run_commit(argc, argv, prefix, &s);
 986        }
 987        index_file = prepare_index(argc, argv, prefix, 0);
 988
 989        /* Set up everything for writing the commit object.  This includes
 990           running hooks, writing the trees, and interacting with the user.  */
 991        if (!prepare_to_commit(index_file, prefix, &s)) {
 992                rollback_index_files();
 993                return 1;
 994        }
 995
 996        /* Determine parents */
 997        if (initial_commit) {
 998                reflog_msg = "commit (initial)";
 999        } else if (amend) {
1000                struct commit_list *c;
1001                struct commit *commit;
1002
1003                reflog_msg = "commit (amend)";
1004                commit = lookup_commit(head_sha1);
1005                if (!commit || parse_commit(commit))
1006                        die("could not parse HEAD commit");
1007
1008                for (c = commit->parents; c; c = c->next)
1009                        pptr = &commit_list_insert(c->item, pptr)->next;
1010        } else if (in_merge) {
1011                struct strbuf m = STRBUF_INIT;
1012                FILE *fp;
1013
1014                reflog_msg = "commit (merge)";
1015                pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
1016                fp = fopen(git_path("MERGE_HEAD"), "r");
1017                if (fp == NULL)
1018                        die_errno("could not open '%s' for reading",
1019                                  git_path("MERGE_HEAD"));
1020                while (strbuf_getline(&m, fp, '\n') != EOF) {
1021                        unsigned char sha1[20];
1022                        if (get_sha1_hex(m.buf, sha1) < 0)
1023                                die("Corrupt MERGE_HEAD file (%s)", m.buf);
1024                        pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
1025                }
1026                fclose(fp);
1027                strbuf_release(&m);
1028                if (!stat(git_path("MERGE_MODE"), &statbuf)) {
1029                        if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
1030                                die_errno("could not read MERGE_MODE");
1031                        if (!strcmp(sb.buf, "no-ff"))
1032                                allow_fast_forward = 0;
1033                }
1034                if (allow_fast_forward)
1035                        parents = reduce_heads(parents);
1036        } else {
1037                reflog_msg = "commit";
1038                pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
1039        }
1040
1041        /* Finally, get the commit message */
1042        strbuf_reset(&sb);
1043        if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
1044                int saved_errno = errno;
1045                rollback_index_files();
1046                die("could not read commit message: %s", strerror(saved_errno));
1047        }
1048
1049        /* Truncate the message just before the diff, if any. */
1050        if (verbose) {
1051                p = strstr(sb.buf, "\ndiff --git ");
1052                if (p != NULL)
1053                        strbuf_setlen(&sb, p - sb.buf + 1);
1054        }
1055
1056        if (cleanup_mode != CLEANUP_NONE)
1057                stripspace(&sb, cleanup_mode == CLEANUP_ALL);
1058        if (message_is_empty(&sb)) {
1059                rollback_index_files();
1060                fprintf(stderr, "Aborting commit due to empty commit message.\n");
1061                exit(1);
1062        }
1063
1064        if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
1065                        fmt_ident(author_name, author_email, author_date,
1066                                IDENT_ERROR_ON_NO_NAME))) {
1067                rollback_index_files();
1068                die("failed to write commit object");
1069        }
1070
1071        ref_lock = lock_any_ref_for_update("HEAD",
1072                                           initial_commit ? NULL : head_sha1,
1073                                           0);
1074
1075        nl = strchr(sb.buf, '\n');
1076        if (nl)
1077                strbuf_setlen(&sb, nl + 1 - sb.buf);
1078        else
1079                strbuf_addch(&sb, '\n');
1080        strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1081        strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
1082
1083        if (!ref_lock) {
1084                rollback_index_files();
1085                die("cannot lock HEAD ref");
1086        }
1087        if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
1088                rollback_index_files();
1089                die("cannot update HEAD ref");
1090        }
1091
1092        unlink(git_path("MERGE_HEAD"));
1093        unlink(git_path("MERGE_MSG"));
1094        unlink(git_path("MERGE_MODE"));
1095        unlink(git_path("SQUASH_MSG"));
1096
1097        if (commit_index_files())
1098                die ("Repository has been updated, but unable to write\n"
1099                     "new_index file. Check that disk is not full or quota is\n"
1100                     "not exceeded, and then \"git reset HEAD\" to recover.");
1101
1102        rerere();
1103        run_hook(get_index_file(), "post-commit", NULL);
1104        if (!quiet)
1105                print_summary(prefix, commit_sha1);
1106
1107        return 0;
1108}