builtin / commit.con commit sha1-file.c: mark more strings for translation (259328b)
   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 "config.h"
  10#include "lockfile.h"
  11#include "cache-tree.h"
  12#include "color.h"
  13#include "dir.h"
  14#include "builtin.h"
  15#include "diff.h"
  16#include "diffcore.h"
  17#include "commit.h"
  18#include "revision.h"
  19#include "wt-status.h"
  20#include "run-command.h"
  21#include "refs.h"
  22#include "log-tree.h"
  23#include "strbuf.h"
  24#include "utf8.h"
  25#include "parse-options.h"
  26#include "string-list.h"
  27#include "rerere.h"
  28#include "unpack-trees.h"
  29#include "quote.h"
  30#include "submodule.h"
  31#include "gpg-interface.h"
  32#include "column.h"
  33#include "sequencer.h"
  34#include "mailmap.h"
  35#include "help.h"
  36
  37static const char * const builtin_commit_usage[] = {
  38        N_("git commit [<options>] [--] <pathspec>..."),
  39        NULL
  40};
  41
  42static const char * const builtin_status_usage[] = {
  43        N_("git status [<options>] [--] <pathspec>..."),
  44        NULL
  45};
  46
  47static const char empty_amend_advice[] =
  48N_("You asked to amend the most recent commit, but doing so would make\n"
  49"it empty. You can repeat your command with --allow-empty, or you can\n"
  50"remove the commit entirely with \"git reset HEAD^\".\n");
  51
  52static const char empty_cherry_pick_advice[] =
  53N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
  54"If you wish to commit it anyway, use:\n"
  55"\n"
  56"    git commit --allow-empty\n"
  57"\n");
  58
  59static const char empty_cherry_pick_advice_single[] =
  60N_("Otherwise, please use 'git reset'\n");
  61
  62static const char empty_cherry_pick_advice_multi[] =
  63N_("If you wish to skip this commit, use:\n"
  64"\n"
  65"    git reset\n"
  66"\n"
  67"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
  68"the remaining commits.\n");
  69
  70static const char *color_status_slots[] = {
  71        [WT_STATUS_HEADER]        = "header",
  72        [WT_STATUS_UPDATED]       = "updated",
  73        [WT_STATUS_CHANGED]       = "changed",
  74        [WT_STATUS_UNTRACKED]     = "untracked",
  75        [WT_STATUS_NOBRANCH]      = "noBranch",
  76        [WT_STATUS_UNMERGED]      = "unmerged",
  77        [WT_STATUS_LOCAL_BRANCH]  = "localBranch",
  78        [WT_STATUS_REMOTE_BRANCH] = "remoteBranch",
  79        [WT_STATUS_ONBRANCH]      = "branch",
  80};
  81
  82static const char *use_message_buffer;
  83static struct lock_file index_lock; /* real index */
  84static struct lock_file false_lock; /* used only for partial commits */
  85static enum {
  86        COMMIT_AS_IS = 1,
  87        COMMIT_NORMAL,
  88        COMMIT_PARTIAL
  89} commit_style;
  90
  91static const char *logfile, *force_author;
  92static const char *template_file;
  93/*
  94 * The _message variables are commit names from which to take
  95 * the commit message and/or authorship.
  96 */
  97static const char *author_message, *author_message_buffer;
  98static char *edit_message, *use_message;
  99static char *fixup_message, *squash_message;
 100static int all, also, interactive, patch_interactive, only, amend, signoff;
 101static int edit_flag = -1; /* unspecified */
 102static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
 103static int config_commit_verbose = -1; /* unspecified */
 104static int no_post_rewrite, allow_empty_message;
 105static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
 106static char *sign_commit;
 107
 108/*
 109 * The default commit message cleanup mode will remove the lines
 110 * beginning with # (shell comments) and leading and trailing
 111 * whitespaces (empty lines or containing only whitespaces)
 112 * if editor is used, and only the whitespaces if the message
 113 * is specified explicitly.
 114 */
 115static enum commit_msg_cleanup_mode cleanup_mode;
 116static const char *cleanup_arg;
 117
 118static enum commit_whence whence;
 119static int sequencer_in_use;
 120static int use_editor = 1, include_status = 1;
 121static int have_option_m;
 122static struct strbuf message = STRBUF_INIT;
 123
 124static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
 125
 126static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset)
 127{
 128        enum wt_status_format *value = (enum wt_status_format *)opt->value;
 129        if (unset)
 130                *value = STATUS_FORMAT_NONE;
 131        else if (!arg)
 132                *value = STATUS_FORMAT_PORCELAIN;
 133        else if (!strcmp(arg, "v1") || !strcmp(arg, "1"))
 134                *value = STATUS_FORMAT_PORCELAIN;
 135        else if (!strcmp(arg, "v2") || !strcmp(arg, "2"))
 136                *value = STATUS_FORMAT_PORCELAIN_V2;
 137        else
 138                die("unsupported porcelain version '%s'", arg);
 139
 140        return 0;
 141}
 142
 143static int opt_parse_m(const struct option *opt, const char *arg, int unset)
 144{
 145        struct strbuf *buf = opt->value;
 146        if (unset) {
 147                have_option_m = 0;
 148                strbuf_setlen(buf, 0);
 149        } else {
 150                have_option_m = 1;
 151                if (buf->len)
 152                        strbuf_addch(buf, '\n');
 153                strbuf_addstr(buf, arg);
 154                strbuf_complete_line(buf);
 155        }
 156        return 0;
 157}
 158
 159static int opt_parse_rename_score(const struct option *opt, const char *arg, int unset)
 160{
 161        const char **value = opt->value;
 162        if (arg != NULL && *arg == '=')
 163                arg = arg + 1;
 164
 165        *value = arg;
 166        return 0;
 167}
 168
 169static void determine_whence(struct wt_status *s)
 170{
 171        if (file_exists(git_path_merge_head()))
 172                whence = FROM_MERGE;
 173        else if (file_exists(git_path_cherry_pick_head())) {
 174                whence = FROM_CHERRY_PICK;
 175                if (file_exists(git_path_seq_dir()))
 176                        sequencer_in_use = 1;
 177        }
 178        else
 179                whence = FROM_COMMIT;
 180        if (s)
 181                s->whence = whence;
 182}
 183
 184static void status_init_config(struct wt_status *s, config_fn_t fn)
 185{
 186        wt_status_prepare(s);
 187        init_diff_ui_defaults();
 188        git_config(fn, s);
 189        determine_whence(s);
 190        s->hints = advice_status_hints; /* must come after git_config() */
 191}
 192
 193static void rollback_index_files(void)
 194{
 195        switch (commit_style) {
 196        case COMMIT_AS_IS:
 197                break; /* nothing to do */
 198        case COMMIT_NORMAL:
 199                rollback_lock_file(&index_lock);
 200                break;
 201        case COMMIT_PARTIAL:
 202                rollback_lock_file(&index_lock);
 203                rollback_lock_file(&false_lock);
 204                break;
 205        }
 206}
 207
 208static int commit_index_files(void)
 209{
 210        int err = 0;
 211
 212        switch (commit_style) {
 213        case COMMIT_AS_IS:
 214                break; /* nothing to do */
 215        case COMMIT_NORMAL:
 216                err = commit_lock_file(&index_lock);
 217                break;
 218        case COMMIT_PARTIAL:
 219                err = commit_lock_file(&index_lock);
 220                rollback_lock_file(&false_lock);
 221                break;
 222        }
 223
 224        return err;
 225}
 226
 227/*
 228 * Take a union of paths in the index and the named tree (typically, "HEAD"),
 229 * and return the paths that match the given pattern in list.
 230 */
 231static int list_paths(struct string_list *list, const char *with_tree,
 232                      const char *prefix, const struct pathspec *pattern)
 233{
 234        int i, ret;
 235        char *m;
 236
 237        if (!pattern->nr)
 238                return 0;
 239
 240        m = xcalloc(1, pattern->nr);
 241
 242        if (with_tree) {
 243                char *max_prefix = common_prefix(pattern);
 244                overlay_tree_on_index(&the_index, with_tree, max_prefix);
 245                free(max_prefix);
 246        }
 247
 248        for (i = 0; i < active_nr; i++) {
 249                const struct cache_entry *ce = active_cache[i];
 250                struct string_list_item *item;
 251
 252                if (ce->ce_flags & CE_UPDATE)
 253                        continue;
 254                if (!ce_path_match(ce, pattern, m))
 255                        continue;
 256                item = string_list_insert(list, ce->name);
 257                if (ce_skip_worktree(ce))
 258                        item->util = item; /* better a valid pointer than a fake one */
 259        }
 260
 261        ret = report_path_error(m, pattern, prefix);
 262        free(m);
 263        return ret;
 264}
 265
 266static void add_remove_files(struct string_list *list)
 267{
 268        int i;
 269        for (i = 0; i < list->nr; i++) {
 270                struct stat st;
 271                struct string_list_item *p = &(list->items[i]);
 272
 273                /* p->util is skip-worktree */
 274                if (p->util)
 275                        continue;
 276
 277                if (!lstat(p->string, &st)) {
 278                        if (add_to_cache(p->string, &st, 0))
 279                                die(_("updating files failed"));
 280                } else
 281                        remove_file_from_cache(p->string);
 282        }
 283}
 284
 285static void create_base_index(const struct commit *current_head)
 286{
 287        struct tree *tree;
 288        struct unpack_trees_options opts;
 289        struct tree_desc t;
 290
 291        if (!current_head) {
 292                discard_cache();
 293                return;
 294        }
 295
 296        memset(&opts, 0, sizeof(opts));
 297        opts.head_idx = 1;
 298        opts.index_only = 1;
 299        opts.merge = 1;
 300        opts.src_index = &the_index;
 301        opts.dst_index = &the_index;
 302
 303        opts.fn = oneway_merge;
 304        tree = parse_tree_indirect(&current_head->object.oid);
 305        if (!tree)
 306                die(_("failed to unpack HEAD tree object"));
 307        parse_tree(tree);
 308        init_tree_desc(&t, tree->buffer, tree->size);
 309        if (unpack_trees(1, &t, &opts))
 310                exit(128); /* We've already reported the error, finish dying */
 311}
 312
 313static void refresh_cache_or_die(int refresh_flags)
 314{
 315        /*
 316         * refresh_flags contains REFRESH_QUIET, so the only errors
 317         * are for unmerged entries.
 318         */
 319        if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN))
 320                die_resolve_conflict("commit");
 321}
 322
 323static const char *prepare_index(int argc, const char **argv, const char *prefix,
 324                                 const struct commit *current_head, int is_status)
 325{
 326        struct string_list partial = STRING_LIST_INIT_DUP;
 327        struct pathspec pathspec;
 328        int refresh_flags = REFRESH_QUIET;
 329        const char *ret;
 330
 331        if (is_status)
 332                refresh_flags |= REFRESH_UNMERGED;
 333        parse_pathspec(&pathspec, 0,
 334                       PATHSPEC_PREFER_FULL,
 335                       prefix, argv);
 336
 337        if (read_cache_preload(&pathspec) < 0)
 338                die(_("index file corrupt"));
 339
 340        if (interactive) {
 341                char *old_index_env = NULL;
 342                hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 343
 344                refresh_cache_or_die(refresh_flags);
 345
 346                if (write_locked_index(&the_index, &index_lock, 0))
 347                        die(_("unable to create temporary index"));
 348
 349                old_index_env = getenv(INDEX_ENVIRONMENT);
 350                setenv(INDEX_ENVIRONMENT, get_lock_file_path(&index_lock), 1);
 351
 352                if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
 353                        die(_("interactive add failed"));
 354
 355                if (old_index_env && *old_index_env)
 356                        setenv(INDEX_ENVIRONMENT, old_index_env, 1);
 357                else
 358                        unsetenv(INDEX_ENVIRONMENT);
 359
 360                discard_cache();
 361                read_cache_from(get_lock_file_path(&index_lock));
 362                if (update_main_cache_tree(WRITE_TREE_SILENT) == 0) {
 363                        if (reopen_lock_file(&index_lock) < 0)
 364                                die(_("unable to write index file"));
 365                        if (write_locked_index(&the_index, &index_lock, 0))
 366                                die(_("unable to update temporary index"));
 367                } else
 368                        warning(_("Failed to update main cache tree"));
 369
 370                commit_style = COMMIT_NORMAL;
 371                ret = get_lock_file_path(&index_lock);
 372                goto out;
 373        }
 374
 375        /*
 376         * Non partial, non as-is commit.
 377         *
 378         * (1) get the real index;
 379         * (2) update the_index as necessary;
 380         * (3) write the_index out to the real index (still locked);
 381         * (4) return the name of the locked index file.
 382         *
 383         * The caller should run hooks on the locked real index, and
 384         * (A) if all goes well, commit the real index;
 385         * (B) on failure, rollback the real index.
 386         */
 387        if (all || (also && pathspec.nr)) {
 388                hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 389                add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
 390                refresh_cache_or_die(refresh_flags);
 391                update_main_cache_tree(WRITE_TREE_SILENT);
 392                if (write_locked_index(&the_index, &index_lock, 0))
 393                        die(_("unable to write new_index file"));
 394                commit_style = COMMIT_NORMAL;
 395                ret = get_lock_file_path(&index_lock);
 396                goto out;
 397        }
 398
 399        /*
 400         * As-is commit.
 401         *
 402         * (1) return the name of the real index file.
 403         *
 404         * The caller should run hooks on the real index,
 405         * and create commit from the_index.
 406         * We still need to refresh the index here.
 407         */
 408        if (!only && !pathspec.nr) {
 409                hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 410                refresh_cache_or_die(refresh_flags);
 411                if (active_cache_changed
 412                    || !cache_tree_fully_valid(active_cache_tree))
 413                        update_main_cache_tree(WRITE_TREE_SILENT);
 414                if (write_locked_index(&the_index, &index_lock,
 415                                       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 416                        die(_("unable to write new_index file"));
 417                commit_style = COMMIT_AS_IS;
 418                ret = get_index_file();
 419                goto out;
 420        }
 421
 422        /*
 423         * A partial commit.
 424         *
 425         * (0) find the set of affected paths;
 426         * (1) get lock on the real index file;
 427         * (2) update the_index with the given paths;
 428         * (3) write the_index out to the real index (still locked);
 429         * (4) get lock on the false index file;
 430         * (5) reset the_index from HEAD;
 431         * (6) update the_index the same way as (2);
 432         * (7) write the_index out to the false index file;
 433         * (8) return the name of the false index file (still locked);
 434         *
 435         * The caller should run hooks on the locked false index, and
 436         * create commit from it.  Then
 437         * (A) if all goes well, commit the real index;
 438         * (B) on failure, rollback the real index;
 439         * In either case, rollback the false index.
 440         */
 441        commit_style = COMMIT_PARTIAL;
 442
 443        if (whence != FROM_COMMIT) {
 444                if (whence == FROM_MERGE)
 445                        die(_("cannot do a partial commit during a merge."));
 446                else if (whence == FROM_CHERRY_PICK)
 447                        die(_("cannot do a partial commit during a cherry-pick."));
 448        }
 449
 450        if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
 451                exit(1);
 452
 453        discard_cache();
 454        if (read_cache() < 0)
 455                die(_("cannot read the index"));
 456
 457        hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 458        add_remove_files(&partial);
 459        refresh_cache(REFRESH_QUIET);
 460        update_main_cache_tree(WRITE_TREE_SILENT);
 461        if (write_locked_index(&the_index, &index_lock, 0))
 462                die(_("unable to write new_index file"));
 463
 464        hold_lock_file_for_update(&false_lock,
 465                                  git_path("next-index-%"PRIuMAX,
 466                                           (uintmax_t) getpid()),
 467                                  LOCK_DIE_ON_ERROR);
 468
 469        create_base_index(current_head);
 470        add_remove_files(&partial);
 471        refresh_cache(REFRESH_QUIET);
 472
 473        if (write_locked_index(&the_index, &false_lock, 0))
 474                die(_("unable to write temporary index file"));
 475
 476        discard_cache();
 477        ret = get_lock_file_path(&false_lock);
 478        read_cache_from(ret);
 479out:
 480        string_list_clear(&partial, 0);
 481        clear_pathspec(&pathspec);
 482        return ret;
 483}
 484
 485static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
 486                      struct wt_status *s)
 487{
 488        struct object_id oid;
 489
 490        if (s->relative_paths)
 491                s->prefix = prefix;
 492
 493        if (amend) {
 494                s->amend = 1;
 495                s->reference = "HEAD^1";
 496        }
 497        s->verbose = verbose;
 498        s->index_file = index_file;
 499        s->fp = fp;
 500        s->nowarn = nowarn;
 501        s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
 502        if (!s->is_initial)
 503                hashcpy(s->sha1_commit, oid.hash);
 504        s->status_format = status_format;
 505        s->ignore_submodule_arg = ignore_submodule_arg;
 506
 507        wt_status_collect(s);
 508        wt_status_print(s);
 509
 510        return s->commitable;
 511}
 512
 513static int is_a_merge(const struct commit *current_head)
 514{
 515        return !!(current_head->parents && current_head->parents->next);
 516}
 517
 518static void assert_split_ident(struct ident_split *id, const struct strbuf *buf)
 519{
 520        if (split_ident_line(id, buf->buf, buf->len) || !id->date_begin)
 521                BUG("unable to parse our own ident: %s", buf->buf);
 522}
 523
 524static void export_one(const char *var, const char *s, const char *e, int hack)
 525{
 526        struct strbuf buf = STRBUF_INIT;
 527        if (hack)
 528                strbuf_addch(&buf, hack);
 529        strbuf_addf(&buf, "%.*s", (int)(e - s), s);
 530        setenv(var, buf.buf, 1);
 531        strbuf_release(&buf);
 532}
 533
 534static int parse_force_date(const char *in, struct strbuf *out)
 535{
 536        strbuf_addch(out, '@');
 537
 538        if (parse_date(in, out) < 0) {
 539                int errors = 0;
 540                unsigned long t = approxidate_careful(in, &errors);
 541                if (errors)
 542                        return -1;
 543                strbuf_addf(out, "%lu", t);
 544        }
 545
 546        return 0;
 547}
 548
 549static void set_ident_var(char **buf, char *val)
 550{
 551        free(*buf);
 552        *buf = val;
 553}
 554
 555static void determine_author_info(struct strbuf *author_ident)
 556{
 557        char *name, *email, *date;
 558        struct ident_split author;
 559
 560        name = xstrdup_or_null(getenv("GIT_AUTHOR_NAME"));
 561        email = xstrdup_or_null(getenv("GIT_AUTHOR_EMAIL"));
 562        date = xstrdup_or_null(getenv("GIT_AUTHOR_DATE"));
 563
 564        if (author_message) {
 565                struct ident_split ident;
 566                size_t len;
 567                const char *a;
 568
 569                a = find_commit_header(author_message_buffer, "author", &len);
 570                if (!a)
 571                        die(_("commit '%s' lacks author header"), author_message);
 572                if (split_ident_line(&ident, a, len) < 0)
 573                        die(_("commit '%s' has malformed author line"), author_message);
 574
 575                set_ident_var(&name, xmemdupz(ident.name_begin, ident.name_end - ident.name_begin));
 576                set_ident_var(&email, xmemdupz(ident.mail_begin, ident.mail_end - ident.mail_begin));
 577
 578                if (ident.date_begin) {
 579                        struct strbuf date_buf = STRBUF_INIT;
 580                        strbuf_addch(&date_buf, '@');
 581                        strbuf_add(&date_buf, ident.date_begin, ident.date_end - ident.date_begin);
 582                        strbuf_addch(&date_buf, ' ');
 583                        strbuf_add(&date_buf, ident.tz_begin, ident.tz_end - ident.tz_begin);
 584                        set_ident_var(&date, strbuf_detach(&date_buf, NULL));
 585                }
 586        }
 587
 588        if (force_author) {
 589                struct ident_split ident;
 590
 591                if (split_ident_line(&ident, force_author, strlen(force_author)) < 0)
 592                        die(_("malformed --author parameter"));
 593                set_ident_var(&name, xmemdupz(ident.name_begin, ident.name_end - ident.name_begin));
 594                set_ident_var(&email, xmemdupz(ident.mail_begin, ident.mail_end - ident.mail_begin));
 595        }
 596
 597        if (force_date) {
 598                struct strbuf date_buf = STRBUF_INIT;
 599                if (parse_force_date(force_date, &date_buf))
 600                        die(_("invalid date format: %s"), force_date);
 601                set_ident_var(&date, strbuf_detach(&date_buf, NULL));
 602        }
 603
 604        strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT));
 605        assert_split_ident(&author, author_ident);
 606        export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0);
 607        export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0);
 608        export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@');
 609        free(name);
 610        free(email);
 611        free(date);
 612}
 613
 614static int author_date_is_interesting(void)
 615{
 616        return author_message || force_date;
 617}
 618
 619static void adjust_comment_line_char(const struct strbuf *sb)
 620{
 621        char candidates[] = "#;@!$%^&|:";
 622        char *candidate;
 623        const char *p;
 624
 625        comment_line_char = candidates[0];
 626        if (!memchr(sb->buf, comment_line_char, sb->len))
 627                return;
 628
 629        p = sb->buf;
 630        candidate = strchr(candidates, *p);
 631        if (candidate)
 632                *candidate = ' ';
 633        for (p = sb->buf; *p; p++) {
 634                if ((p[0] == '\n' || p[0] == '\r') && p[1]) {
 635                        candidate = strchr(candidates, p[1]);
 636                        if (candidate)
 637                                *candidate = ' ';
 638                }
 639        }
 640
 641        for (p = candidates; *p == ' '; p++)
 642                ;
 643        if (!*p)
 644                die(_("unable to select a comment character that is not used\n"
 645                      "in the current commit message"));
 646        comment_line_char = *p;
 647}
 648
 649static int prepare_to_commit(const char *index_file, const char *prefix,
 650                             struct commit *current_head,
 651                             struct wt_status *s,
 652                             struct strbuf *author_ident)
 653{
 654        struct stat statbuf;
 655        struct strbuf committer_ident = STRBUF_INIT;
 656        int commitable;
 657        struct strbuf sb = STRBUF_INIT;
 658        const char *hook_arg1 = NULL;
 659        const char *hook_arg2 = NULL;
 660        int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE);
 661        int old_display_comment_prefix;
 662
 663        /* This checks and barfs if author is badly specified */
 664        determine_author_info(author_ident);
 665
 666        if (!no_verify && run_commit_hook(use_editor, index_file, "pre-commit", NULL))
 667                return 0;
 668
 669        if (squash_message) {
 670                /*
 671                 * Insert the proper subject line before other commit
 672                 * message options add their content.
 673                 */
 674                if (use_message && !strcmp(use_message, squash_message))
 675                        strbuf_addstr(&sb, "squash! ");
 676                else {
 677                        struct pretty_print_context ctx = {0};
 678                        struct commit *c;
 679                        c = lookup_commit_reference_by_name(squash_message);
 680                        if (!c)
 681                                die(_("could not lookup commit %s"), squash_message);
 682                        ctx.output_encoding = get_commit_output_encoding();
 683                        format_commit_message(c, "squash! %s\n\n", &sb,
 684                                              &ctx);
 685                }
 686        }
 687
 688        if (have_option_m && !fixup_message) {
 689                strbuf_addbuf(&sb, &message);
 690                hook_arg1 = "message";
 691        } else if (logfile && !strcmp(logfile, "-")) {
 692                if (isatty(0))
 693                        fprintf(stderr, _("(reading log message from standard input)\n"));
 694                if (strbuf_read(&sb, 0, 0) < 0)
 695                        die_errno(_("could not read log from standard input"));
 696                hook_arg1 = "message";
 697        } else if (logfile) {
 698                if (strbuf_read_file(&sb, logfile, 0) < 0)
 699                        die_errno(_("could not read log file '%s'"),
 700                                  logfile);
 701                hook_arg1 = "message";
 702        } else if (use_message) {
 703                char *buffer;
 704                buffer = strstr(use_message_buffer, "\n\n");
 705                if (buffer)
 706                        strbuf_addstr(&sb, skip_blank_lines(buffer + 2));
 707                hook_arg1 = "commit";
 708                hook_arg2 = use_message;
 709        } else if (fixup_message) {
 710                struct pretty_print_context ctx = {0};
 711                struct commit *commit;
 712                commit = lookup_commit_reference_by_name(fixup_message);
 713                if (!commit)
 714                        die(_("could not lookup commit %s"), fixup_message);
 715                ctx.output_encoding = get_commit_output_encoding();
 716                format_commit_message(commit, "fixup! %s\n\n",
 717                                      &sb, &ctx);
 718                if (have_option_m)
 719                        strbuf_addbuf(&sb, &message);
 720                hook_arg1 = "message";
 721        } else if (!stat(git_path_merge_msg(), &statbuf)) {
 722                /*
 723                 * prepend SQUASH_MSG here if it exists and a
 724                 * "merge --squash" was originally performed
 725                 */
 726                if (!stat(git_path_squash_msg(), &statbuf)) {
 727                        if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
 728                                die_errno(_("could not read SQUASH_MSG"));
 729                        hook_arg1 = "squash";
 730                } else
 731                        hook_arg1 = "merge";
 732                if (strbuf_read_file(&sb, git_path_merge_msg(), 0) < 0)
 733                        die_errno(_("could not read MERGE_MSG"));
 734        } else if (!stat(git_path_squash_msg(), &statbuf)) {
 735                if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
 736                        die_errno(_("could not read SQUASH_MSG"));
 737                hook_arg1 = "squash";
 738        } else if (template_file) {
 739                if (strbuf_read_file(&sb, template_file, 0) < 0)
 740                        die_errno(_("could not read '%s'"), template_file);
 741                hook_arg1 = "template";
 742                clean_message_contents = 0;
 743        }
 744
 745        /*
 746         * The remaining cases don't modify the template message, but
 747         * just set the argument(s) to the prepare-commit-msg hook.
 748         */
 749        else if (whence == FROM_MERGE)
 750                hook_arg1 = "merge";
 751        else if (whence == FROM_CHERRY_PICK) {
 752                hook_arg1 = "commit";
 753                hook_arg2 = "CHERRY_PICK_HEAD";
 754        }
 755
 756        if (squash_message) {
 757                /*
 758                 * If squash_commit was used for the commit subject,
 759                 * then we're possibly hijacking other commit log options.
 760                 * Reset the hook args to tell the real story.
 761                 */
 762                hook_arg1 = "message";
 763                hook_arg2 = "";
 764        }
 765
 766        s->fp = fopen_for_writing(git_path_commit_editmsg());
 767        if (s->fp == NULL)
 768                die_errno(_("could not open '%s'"), git_path_commit_editmsg());
 769
 770        /* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
 771        old_display_comment_prefix = s->display_comment_prefix;
 772        s->display_comment_prefix = 1;
 773
 774        /*
 775         * Most hints are counter-productive when the commit has
 776         * already started.
 777         */
 778        s->hints = 0;
 779
 780        if (clean_message_contents)
 781                strbuf_stripspace(&sb, 0);
 782
 783        if (signoff)
 784                append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0);
 785
 786        if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
 787                die_errno(_("could not write commit template"));
 788
 789        if (auto_comment_line_char)
 790                adjust_comment_line_char(&sb);
 791        strbuf_release(&sb);
 792
 793        /* This checks if committer ident is explicitly given */
 794        strbuf_addstr(&committer_ident, git_committer_info(IDENT_STRICT));
 795        if (use_editor && include_status) {
 796                int ident_shown = 0;
 797                int saved_color_setting;
 798                struct ident_split ci, ai;
 799
 800                if (whence != FROM_COMMIT) {
 801                        if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
 802                                wt_status_add_cut_line(s->fp);
 803                        status_printf_ln(s, GIT_COLOR_NORMAL,
 804                            whence == FROM_MERGE
 805                                ? _("\n"
 806                                        "It looks like you may be committing a merge.\n"
 807                                        "If this is not correct, please remove the file\n"
 808                                        "       %s\n"
 809                                        "and try again.\n")
 810                                : _("\n"
 811                                        "It looks like you may be committing a cherry-pick.\n"
 812                                        "If this is not correct, please remove the file\n"
 813                                        "       %s\n"
 814                                        "and try again.\n"),
 815                                whence == FROM_MERGE ?
 816                                        git_path_merge_head() :
 817                                        git_path_cherry_pick_head());
 818                }
 819
 820                fprintf(s->fp, "\n");
 821                if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL)
 822                        status_printf(s, GIT_COLOR_NORMAL,
 823                                _("Please enter the commit message for your changes."
 824                                  " Lines starting\nwith '%c' will be ignored, and an empty"
 825                                  " message aborts the commit.\n"), comment_line_char);
 826                else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
 827                         whence == FROM_COMMIT)
 828                        wt_status_add_cut_line(s->fp);
 829                else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
 830                        status_printf(s, GIT_COLOR_NORMAL,
 831                                _("Please enter the commit message for your changes."
 832                                  " Lines starting\n"
 833                                  "with '%c' will be kept; you may remove them"
 834                                  " yourself if you want to.\n"
 835                                  "An empty message aborts the commit.\n"), comment_line_char);
 836
 837                /*
 838                 * These should never fail because they come from our own
 839                 * fmt_ident. They may fail the sane_ident test, but we know
 840                 * that the name and mail pointers will at least be valid,
 841                 * which is enough for our tests and printing here.
 842                 */
 843                assert_split_ident(&ai, author_ident);
 844                assert_split_ident(&ci, &committer_ident);
 845
 846                if (ident_cmp(&ai, &ci))
 847                        status_printf_ln(s, GIT_COLOR_NORMAL,
 848                                _("%s"
 849                                "Author:    %.*s <%.*s>"),
 850                                ident_shown++ ? "" : "\n",
 851                                (int)(ai.name_end - ai.name_begin), ai.name_begin,
 852                                (int)(ai.mail_end - ai.mail_begin), ai.mail_begin);
 853
 854                if (author_date_is_interesting())
 855                        status_printf_ln(s, GIT_COLOR_NORMAL,
 856                                _("%s"
 857                                "Date:      %s"),
 858                                ident_shown++ ? "" : "\n",
 859                                show_ident_date(&ai, DATE_MODE(NORMAL)));
 860
 861                if (!committer_ident_sufficiently_given())
 862                        status_printf_ln(s, GIT_COLOR_NORMAL,
 863                                _("%s"
 864                                "Committer: %.*s <%.*s>"),
 865                                ident_shown++ ? "" : "\n",
 866                                (int)(ci.name_end - ci.name_begin), ci.name_begin,
 867                                (int)(ci.mail_end - ci.mail_begin), ci.mail_begin);
 868
 869                status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); /* Add new line for clarity */
 870
 871                saved_color_setting = s->use_color;
 872                s->use_color = 0;
 873                commitable = run_status(s->fp, index_file, prefix, 1, s);
 874                s->use_color = saved_color_setting;
 875        } else {
 876                struct object_id oid;
 877                const char *parent = "HEAD";
 878
 879                if (!active_nr && read_cache() < 0)
 880                        die(_("Cannot read index"));
 881
 882                if (amend)
 883                        parent = "HEAD^1";
 884
 885                if (get_oid(parent, &oid)) {
 886                        int i, ita_nr = 0;
 887
 888                        for (i = 0; i < active_nr; i++)
 889                                if (ce_intent_to_add(active_cache[i]))
 890                                        ita_nr++;
 891                        commitable = active_nr - ita_nr > 0;
 892                } else {
 893                        /*
 894                         * Unless the user did explicitly request a submodule
 895                         * ignore mode by passing a command line option we do
 896                         * not ignore any changed submodule SHA-1s when
 897                         * comparing index and parent, no matter what is
 898                         * configured. Otherwise we won't commit any
 899                         * submodules which were manually staged, which would
 900                         * be really confusing.
 901                         */
 902                        struct diff_flags flags = DIFF_FLAGS_INIT;
 903                        flags.override_submodule_config = 1;
 904                        if (ignore_submodule_arg &&
 905                            !strcmp(ignore_submodule_arg, "all"))
 906                                flags.ignore_submodules = 1;
 907                        commitable = index_differs_from(parent, &flags, 1);
 908                }
 909        }
 910        strbuf_release(&committer_ident);
 911
 912        fclose(s->fp);
 913
 914        /*
 915         * Reject an attempt to record a non-merge empty commit without
 916         * explicit --allow-empty. In the cherry-pick case, it may be
 917         * empty due to conflict resolution, which the user should okay.
 918         */
 919        if (!commitable && whence != FROM_MERGE && !allow_empty &&
 920            !(amend && is_a_merge(current_head))) {
 921                s->display_comment_prefix = old_display_comment_prefix;
 922                run_status(stdout, index_file, prefix, 0, s);
 923                if (amend)
 924                        fputs(_(empty_amend_advice), stderr);
 925                else if (whence == FROM_CHERRY_PICK) {
 926                        fputs(_(empty_cherry_pick_advice), stderr);
 927                        if (!sequencer_in_use)
 928                                fputs(_(empty_cherry_pick_advice_single), stderr);
 929                        else
 930                                fputs(_(empty_cherry_pick_advice_multi), stderr);
 931                }
 932                return 0;
 933        }
 934
 935        if (!no_verify && find_hook("pre-commit")) {
 936                /*
 937                 * Re-read the index as pre-commit hook could have updated it,
 938                 * and write it out as a tree.  We must do this before we invoke
 939                 * the editor and after we invoke run_status above.
 940                 */
 941                discard_cache();
 942        }
 943        read_cache_from(index_file);
 944
 945        if (update_main_cache_tree(0)) {
 946                error(_("Error building trees"));
 947                return 0;
 948        }
 949
 950        if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
 951                            git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL))
 952                return 0;
 953
 954        if (use_editor) {
 955                struct argv_array env = ARGV_ARRAY_INIT;
 956
 957                argv_array_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
 958                if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) {
 959                        fprintf(stderr,
 960                        _("Please supply the message using either -m or -F option.\n"));
 961                        exit(1);
 962                }
 963                argv_array_clear(&env);
 964        }
 965
 966        if (!no_verify &&
 967            run_commit_hook(use_editor, index_file, "commit-msg", git_path_commit_editmsg(), NULL)) {
 968                return 0;
 969        }
 970
 971        return 1;
 972}
 973
 974static const char *find_author_by_nickname(const char *name)
 975{
 976        struct rev_info revs;
 977        struct commit *commit;
 978        struct strbuf buf = STRBUF_INIT;
 979        struct string_list mailmap = STRING_LIST_INIT_NODUP;
 980        const char *av[20];
 981        int ac = 0;
 982
 983        init_revisions(&revs, NULL);
 984        strbuf_addf(&buf, "--author=%s", name);
 985        av[++ac] = "--all";
 986        av[++ac] = "-i";
 987        av[++ac] = buf.buf;
 988        av[++ac] = NULL;
 989        setup_revisions(ac, av, &revs, NULL);
 990        revs.mailmap = &mailmap;
 991        read_mailmap(revs.mailmap, NULL);
 992
 993        if (prepare_revision_walk(&revs))
 994                die(_("revision walk setup failed"));
 995        commit = get_revision(&revs);
 996        if (commit) {
 997                struct pretty_print_context ctx = {0};
 998                ctx.date_mode.type = DATE_NORMAL;
 999                strbuf_release(&buf);
1000                format_commit_message(commit, "%aN <%aE>", &buf, &ctx);
1001                clear_mailmap(&mailmap);
1002                return strbuf_detach(&buf, NULL);
1003        }
1004        die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
1005}
1006
1007static void handle_ignored_arg(struct wt_status *s)
1008{
1009        if (!ignored_arg)
1010                ; /* default already initialized */
1011        else if (!strcmp(ignored_arg, "traditional"))
1012                s->show_ignored_mode = SHOW_TRADITIONAL_IGNORED;
1013        else if (!strcmp(ignored_arg, "no"))
1014                s->show_ignored_mode = SHOW_NO_IGNORED;
1015        else if (!strcmp(ignored_arg, "matching"))
1016                s->show_ignored_mode = SHOW_MATCHING_IGNORED;
1017        else
1018                die(_("Invalid ignored mode '%s'"), ignored_arg);
1019}
1020
1021static void handle_untracked_files_arg(struct wt_status *s)
1022{
1023        if (!untracked_files_arg)
1024                ; /* default already initialized */
1025        else if (!strcmp(untracked_files_arg, "no"))
1026                s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
1027        else if (!strcmp(untracked_files_arg, "normal"))
1028                s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
1029        else if (!strcmp(untracked_files_arg, "all"))
1030                s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
1031        else
1032                die(_("Invalid untracked files mode '%s'"), untracked_files_arg);
1033}
1034
1035static const char *read_commit_message(const char *name)
1036{
1037        const char *out_enc;
1038        struct commit *commit;
1039
1040        commit = lookup_commit_reference_by_name(name);
1041        if (!commit)
1042                die(_("could not lookup commit %s"), name);
1043        out_enc = get_commit_output_encoding();
1044        return logmsg_reencode(commit, NULL, out_enc);
1045}
1046
1047/*
1048 * Enumerate what needs to be propagated when --porcelain
1049 * is not in effect here.
1050 */
1051static struct status_deferred_config {
1052        enum wt_status_format status_format;
1053        int show_branch;
1054} status_deferred_config = {
1055        STATUS_FORMAT_UNSPECIFIED,
1056        -1 /* unspecified */
1057};
1058
1059static void finalize_deferred_config(struct wt_status *s)
1060{
1061        int use_deferred_config = (status_format != STATUS_FORMAT_PORCELAIN &&
1062                                   status_format != STATUS_FORMAT_PORCELAIN_V2 &&
1063                                   !s->null_termination);
1064
1065        if (s->null_termination) {
1066                if (status_format == STATUS_FORMAT_NONE ||
1067                    status_format == STATUS_FORMAT_UNSPECIFIED)
1068                        status_format = STATUS_FORMAT_PORCELAIN;
1069                else if (status_format == STATUS_FORMAT_LONG)
1070                        die(_("--long and -z are incompatible"));
1071        }
1072
1073        if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)
1074                status_format = status_deferred_config.status_format;
1075        if (status_format == STATUS_FORMAT_UNSPECIFIED)
1076                status_format = STATUS_FORMAT_NONE;
1077
1078        if (use_deferred_config && s->show_branch < 0)
1079                s->show_branch = status_deferred_config.show_branch;
1080        if (s->show_branch < 0)
1081                s->show_branch = 0;
1082
1083        if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
1084                s->ahead_behind_flags = AHEAD_BEHIND_FULL;
1085}
1086
1087static int parse_and_validate_options(int argc, const char *argv[],
1088                                      const struct option *options,
1089                                      const char * const usage[],
1090                                      const char *prefix,
1091                                      struct commit *current_head,
1092                                      struct wt_status *s)
1093{
1094        int f = 0;
1095
1096        argc = parse_options(argc, argv, prefix, options, usage, 0);
1097        finalize_deferred_config(s);
1098
1099        if (force_author && !strchr(force_author, '>'))
1100                force_author = find_author_by_nickname(force_author);
1101
1102        if (force_author && renew_authorship)
1103                die(_("Using both --reset-author and --author does not make sense"));
1104
1105        if (logfile || have_option_m || use_message || fixup_message)
1106                use_editor = 0;
1107        if (0 <= edit_flag)
1108                use_editor = edit_flag;
1109
1110        /* Sanity check options */
1111        if (amend && !current_head)
1112                die(_("You have nothing to amend."));
1113        if (amend && whence != FROM_COMMIT) {
1114                if (whence == FROM_MERGE)
1115                        die(_("You are in the middle of a merge -- cannot amend."));
1116                else if (whence == FROM_CHERRY_PICK)
1117                        die(_("You are in the middle of a cherry-pick -- cannot amend."));
1118        }
1119        if (fixup_message && squash_message)
1120                die(_("Options --squash and --fixup cannot be used together"));
1121        if (use_message)
1122                f++;
1123        if (edit_message)
1124                f++;
1125        if (fixup_message)
1126                f++;
1127        if (logfile)
1128                f++;
1129        if (f > 1)
1130                die(_("Only one of -c/-C/-F/--fixup can be used."));
1131        if (have_option_m && (edit_message || use_message || logfile))
1132                die((_("Option -m cannot be combined with -c/-C/-F.")));
1133        if (f || have_option_m)
1134                template_file = NULL;
1135        if (edit_message)
1136                use_message = edit_message;
1137        if (amend && !use_message && !fixup_message)
1138                use_message = "HEAD";
1139        if (!use_message && whence != FROM_CHERRY_PICK && renew_authorship)
1140                die(_("--reset-author can be used only with -C, -c or --amend."));
1141        if (use_message) {
1142                use_message_buffer = read_commit_message(use_message);
1143                if (!renew_authorship) {
1144                        author_message = use_message;
1145                        author_message_buffer = use_message_buffer;
1146                }
1147        }
1148        if (whence == FROM_CHERRY_PICK && !renew_authorship) {
1149                author_message = "CHERRY_PICK_HEAD";
1150                author_message_buffer = read_commit_message(author_message);
1151        }
1152
1153        if (patch_interactive)
1154                interactive = 1;
1155
1156        if (also + only + all + interactive > 1)
1157                die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
1158        if (argc == 0 && (also || (only && !amend && !allow_empty)))
1159                die(_("No paths with --include/--only does not make sense."));
1160        if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
1161                cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_ALL :
1162                                            COMMIT_MSG_CLEANUP_SPACE;
1163        else if (!strcmp(cleanup_arg, "verbatim"))
1164                cleanup_mode = COMMIT_MSG_CLEANUP_NONE;
1165        else if (!strcmp(cleanup_arg, "whitespace"))
1166                cleanup_mode = COMMIT_MSG_CLEANUP_SPACE;
1167        else if (!strcmp(cleanup_arg, "strip"))
1168                cleanup_mode = COMMIT_MSG_CLEANUP_ALL;
1169        else if (!strcmp(cleanup_arg, "scissors"))
1170                cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_SCISSORS :
1171                                            COMMIT_MSG_CLEANUP_SPACE;
1172        else
1173                die(_("Invalid cleanup mode %s"), cleanup_arg);
1174
1175        handle_untracked_files_arg(s);
1176
1177        if (all && argc > 0)
1178                die(_("Paths with -a does not make sense."));
1179
1180        if (status_format != STATUS_FORMAT_NONE)
1181                dry_run = 1;
1182
1183        return argc;
1184}
1185
1186static int dry_run_commit(int argc, const char **argv, const char *prefix,
1187                          const struct commit *current_head, struct wt_status *s)
1188{
1189        int commitable;
1190        const char *index_file;
1191
1192        index_file = prepare_index(argc, argv, prefix, current_head, 1);
1193        commitable = run_status(stdout, index_file, prefix, 0, s);
1194        rollback_index_files();
1195
1196        return commitable ? 0 : 1;
1197}
1198
1199define_list_config_array_extra(color_status_slots, {"added"});
1200
1201static int parse_status_slot(const char *slot)
1202{
1203        if (!strcasecmp(slot, "added"))
1204                return WT_STATUS_UPDATED;
1205
1206        return LOOKUP_CONFIG(color_status_slots, slot);
1207}
1208
1209static int git_status_config(const char *k, const char *v, void *cb)
1210{
1211        struct wt_status *s = cb;
1212        const char *slot_name;
1213
1214        if (starts_with(k, "column."))
1215                return git_column_config(k, v, "status", &s->colopts);
1216        if (!strcmp(k, "status.submodulesummary")) {
1217                int is_bool;
1218                s->submodule_summary = git_config_bool_or_int(k, v, &is_bool);
1219                if (is_bool && s->submodule_summary)
1220                        s->submodule_summary = -1;
1221                return 0;
1222        }
1223        if (!strcmp(k, "status.short")) {
1224                if (git_config_bool(k, v))
1225                        status_deferred_config.status_format = STATUS_FORMAT_SHORT;
1226                else
1227                        status_deferred_config.status_format = STATUS_FORMAT_NONE;
1228                return 0;
1229        }
1230        if (!strcmp(k, "status.branch")) {
1231                status_deferred_config.show_branch = git_config_bool(k, v);
1232                return 0;
1233        }
1234        if (!strcmp(k, "status.showstash")) {
1235                s->show_stash = git_config_bool(k, v);
1236                return 0;
1237        }
1238        if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
1239                s->use_color = git_config_colorbool(k, v);
1240                return 0;
1241        }
1242        if (!strcmp(k, "status.displaycommentprefix")) {
1243                s->display_comment_prefix = git_config_bool(k, v);
1244                return 0;
1245        }
1246        if (skip_prefix(k, "status.color.", &slot_name) ||
1247            skip_prefix(k, "color.status.", &slot_name)) {
1248                int slot = parse_status_slot(slot_name);
1249                if (slot < 0)
1250                        return 0;
1251                if (!v)
1252                        return config_error_nonbool(k);
1253                return color_parse(v, s->color_palette[slot]);
1254        }
1255        if (!strcmp(k, "status.relativepaths")) {
1256                s->relative_paths = git_config_bool(k, v);
1257                return 0;
1258        }
1259        if (!strcmp(k, "status.showuntrackedfiles")) {
1260                if (!v)
1261                        return config_error_nonbool(k);
1262                else if (!strcmp(v, "no"))
1263                        s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
1264                else if (!strcmp(v, "normal"))
1265                        s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
1266                else if (!strcmp(v, "all"))
1267                        s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
1268                else
1269                        return error(_("Invalid untracked files mode '%s'"), v);
1270                return 0;
1271        }
1272        if (!strcmp(k, "diff.renamelimit")) {
1273                if (s->rename_limit == -1)
1274                        s->rename_limit = git_config_int(k, v);
1275                return 0;
1276        }
1277        if (!strcmp(k, "status.renamelimit")) {
1278                s->rename_limit = git_config_int(k, v);
1279                return 0;
1280        }
1281        if (!strcmp(k, "diff.renames")) {
1282                if (s->detect_rename == -1)
1283                        s->detect_rename = git_config_rename(k, v);
1284                return 0;
1285        }
1286        if (!strcmp(k, "status.renames")) {
1287                s->detect_rename = git_config_rename(k, v);
1288                return 0;
1289        }
1290        return git_diff_ui_config(k, v, NULL);
1291}
1292
1293int cmd_status(int argc, const char **argv, const char *prefix)
1294{
1295        static int no_renames = -1;
1296        static const char *rename_score_arg = (const char *)-1;
1297        static struct wt_status s;
1298        int fd;
1299        struct object_id oid;
1300        static struct option builtin_status_options[] = {
1301                OPT__VERBOSE(&verbose, N_("be verbose")),
1302                OPT_SET_INT('s', "short", &status_format,
1303                            N_("show status concisely"), STATUS_FORMAT_SHORT),
1304                OPT_BOOL('b', "branch", &s.show_branch,
1305                         N_("show branch information")),
1306                OPT_BOOL(0, "show-stash", &s.show_stash,
1307                         N_("show stash information")),
1308                OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
1309                         N_("compute full ahead/behind values")),
1310                { OPTION_CALLBACK, 0, "porcelain", &status_format,
1311                  N_("version"), N_("machine-readable output"),
1312                  PARSE_OPT_OPTARG, opt_parse_porcelain },
1313                OPT_SET_INT(0, "long", &status_format,
1314                            N_("show status in long format (default)"),
1315                            STATUS_FORMAT_LONG),
1316                OPT_BOOL('z', "null", &s.null_termination,
1317                         N_("terminate entries with NUL")),
1318                { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg,
1319                  N_("mode"),
1320                  N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
1321                  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
1322                { OPTION_STRING, 0, "ignored", &ignored_arg,
1323                  N_("mode"),
1324                  N_("show ignored files, optional modes: traditional, matching, no. (Default: traditional)"),
1325                  PARSE_OPT_OPTARG, NULL, (intptr_t)"traditional" },
1326                { OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"),
1327                  N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
1328                  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
1329                OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
1330                OPT_BOOL(0, "no-renames", &no_renames, N_("do not detect renames")),
1331                { OPTION_CALLBACK, 'M', "find-renames", &rename_score_arg,
1332                  N_("n"), N_("detect renames, optionally set similarity index"),
1333                  PARSE_OPT_OPTARG, opt_parse_rename_score },
1334                OPT_END(),
1335        };
1336
1337        if (argc == 2 && !strcmp(argv[1], "-h"))
1338                usage_with_options(builtin_status_usage, builtin_status_options);
1339
1340        status_init_config(&s, git_status_config);
1341        argc = parse_options(argc, argv, prefix,
1342                             builtin_status_options,
1343                             builtin_status_usage, 0);
1344        finalize_colopts(&s.colopts, -1);
1345        finalize_deferred_config(&s);
1346
1347        handle_untracked_files_arg(&s);
1348        handle_ignored_arg(&s);
1349
1350        if (s.show_ignored_mode == SHOW_MATCHING_IGNORED &&
1351            s.show_untracked_files == SHOW_NO_UNTRACKED_FILES)
1352                die(_("Unsupported combination of ignored and untracked-files arguments"));
1353
1354        parse_pathspec(&s.pathspec, 0,
1355                       PATHSPEC_PREFER_FULL,
1356                       prefix, argv);
1357
1358        read_cache_preload(&s.pathspec);
1359        refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
1360
1361        if (use_optional_locks())
1362                fd = hold_locked_index(&index_lock, 0);
1363        else
1364                fd = -1;
1365
1366        s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
1367        if (!s.is_initial)
1368                hashcpy(s.sha1_commit, oid.hash);
1369
1370        s.ignore_submodule_arg = ignore_submodule_arg;
1371        s.status_format = status_format;
1372        s.verbose = verbose;
1373        if (no_renames != -1)
1374                s.detect_rename = !no_renames;
1375        if ((intptr_t)rename_score_arg != -1) {
1376                if (s.detect_rename < DIFF_DETECT_RENAME)
1377                        s.detect_rename = DIFF_DETECT_RENAME;
1378                if (rename_score_arg)
1379                        s.rename_score = parse_rename_score(&rename_score_arg);
1380        }
1381
1382        wt_status_collect(&s);
1383
1384        if (0 <= fd)
1385                update_index_if_able(&the_index, &index_lock);
1386
1387        if (s.relative_paths)
1388                s.prefix = prefix;
1389
1390        wt_status_print(&s);
1391        return 0;
1392}
1393
1394static int git_commit_config(const char *k, const char *v, void *cb)
1395{
1396        struct wt_status *s = cb;
1397        int status;
1398
1399        if (!strcmp(k, "commit.template"))
1400                return git_config_pathname(&template_file, k, v);
1401        if (!strcmp(k, "commit.status")) {
1402                include_status = git_config_bool(k, v);
1403                return 0;
1404        }
1405        if (!strcmp(k, "commit.cleanup"))
1406                return git_config_string(&cleanup_arg, k, v);
1407        if (!strcmp(k, "commit.gpgsign")) {
1408                sign_commit = git_config_bool(k, v) ? "" : NULL;
1409                return 0;
1410        }
1411        if (!strcmp(k, "commit.verbose")) {
1412                int is_bool;
1413                config_commit_verbose = git_config_bool_or_int(k, v, &is_bool);
1414                return 0;
1415        }
1416
1417        status = git_gpg_config(k, v, NULL);
1418        if (status)
1419                return status;
1420        return git_status_config(k, v, s);
1421}
1422
1423int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...)
1424{
1425        struct argv_array hook_env = ARGV_ARRAY_INIT;
1426        va_list args;
1427        int ret;
1428
1429        argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
1430
1431        /*
1432         * Let the hook know that no editor will be launched.
1433         */
1434        if (!editor_is_used)
1435                argv_array_push(&hook_env, "GIT_EDITOR=:");
1436
1437        va_start(args, name);
1438        ret = run_hook_ve(hook_env.argv,name, args);
1439        va_end(args);
1440        argv_array_clear(&hook_env);
1441
1442        return ret;
1443}
1444
1445int cmd_commit(int argc, const char **argv, const char *prefix)
1446{
1447        const char *argv_gc_auto[] = {"gc", "--auto", NULL};
1448        static struct wt_status s;
1449        static struct option builtin_commit_options[] = {
1450                OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
1451                OPT__VERBOSE(&verbose, N_("show diff in commit message template")),
1452
1453                OPT_GROUP(N_("Commit message options")),
1454                OPT_FILENAME('F', "file", &logfile, N_("read message from file")),
1455                OPT_STRING(0, "author", &force_author, N_("author"), N_("override author for commit")),
1456                OPT_STRING(0, "date", &force_date, N_("date"), N_("override date for commit")),
1457                OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m),
1458                OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")),
1459                OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")),
1460                OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
1461                OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
1462                OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
1463                OPT_BOOL('s', "signoff", &signoff, N_("add Signed-off-by:")),
1464                OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
1465                OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
1466                OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
1467                OPT_BOOL(0, "status", &include_status, N_("include status in commit message template")),
1468                { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
1469                  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
1470                /* end commit message options */
1471
1472                OPT_GROUP(N_("Commit contents options")),
1473                OPT_BOOL('a', "all", &all, N_("commit all changed files")),
1474                OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")),
1475                OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
1476                OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
1477                OPT_BOOL('o', "only", &only, N_("commit only specified files")),
1478                OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
1479                OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
1480                OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
1481                            STATUS_FORMAT_SHORT),
1482                OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")),
1483                OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
1484                         N_("compute full ahead/behind values")),
1485                OPT_SET_INT(0, "porcelain", &status_format,
1486                            N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
1487                OPT_SET_INT(0, "long", &status_format,
1488                            N_("show status in long format (default)"),
1489                            STATUS_FORMAT_LONG),
1490                OPT_BOOL('z', "null", &s.null_termination,
1491                         N_("terminate entries with NUL")),
1492                OPT_BOOL(0, "amend", &amend, N_("amend previous commit")),
1493                OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
1494                { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
1495                /* end commit contents options */
1496
1497                OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty,
1498                                N_("ok to record an empty change")),
1499                OPT_HIDDEN_BOOL(0, "allow-empty-message", &allow_empty_message,
1500                                N_("ok to record a change with an empty message")),
1501
1502                OPT_END()
1503        };
1504
1505        struct strbuf sb = STRBUF_INIT;
1506        struct strbuf author_ident = STRBUF_INIT;
1507        const char *index_file, *reflog_msg;
1508        struct object_id oid;
1509        struct commit_list *parents = NULL;
1510        struct stat statbuf;
1511        struct commit *current_head = NULL;
1512        struct commit_extra_header *extra = NULL;
1513        struct strbuf err = STRBUF_INIT;
1514
1515        if (argc == 2 && !strcmp(argv[1], "-h"))
1516                usage_with_options(builtin_commit_usage, builtin_commit_options);
1517
1518        status_init_config(&s, git_commit_config);
1519        s.commit_template = 1;
1520        status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
1521        s.colopts = 0;
1522
1523        if (get_oid("HEAD", &oid))
1524                current_head = NULL;
1525        else {
1526                current_head = lookup_commit_or_die(&oid, "HEAD");
1527                if (parse_commit(current_head))
1528                        die(_("could not parse HEAD commit"));
1529        }
1530        verbose = -1; /* unspecified */
1531        argc = parse_and_validate_options(argc, argv, builtin_commit_options,
1532                                          builtin_commit_usage,
1533                                          prefix, current_head, &s);
1534        if (verbose == -1)
1535                verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
1536
1537        if (dry_run)
1538                return dry_run_commit(argc, argv, prefix, current_head, &s);
1539        index_file = prepare_index(argc, argv, prefix, current_head, 0);
1540
1541        /* Set up everything for writing the commit object.  This includes
1542           running hooks, writing the trees, and interacting with the user.  */
1543        if (!prepare_to_commit(index_file, prefix,
1544                               current_head, &s, &author_ident)) {
1545                rollback_index_files();
1546                return 1;
1547        }
1548
1549        /* Determine parents */
1550        reflog_msg = getenv("GIT_REFLOG_ACTION");
1551        if (!current_head) {
1552                if (!reflog_msg)
1553                        reflog_msg = "commit (initial)";
1554        } else if (amend) {
1555                if (!reflog_msg)
1556                        reflog_msg = "commit (amend)";
1557                parents = copy_commit_list(current_head->parents);
1558        } else if (whence == FROM_MERGE) {
1559                struct strbuf m = STRBUF_INIT;
1560                FILE *fp;
1561                int allow_fast_forward = 1;
1562                struct commit_list **pptr = &parents;
1563
1564                if (!reflog_msg)
1565                        reflog_msg = "commit (merge)";
1566                pptr = commit_list_append(current_head, pptr);
1567                fp = xfopen(git_path_merge_head(), "r");
1568                while (strbuf_getline_lf(&m, fp) != EOF) {
1569                        struct commit *parent;
1570
1571                        parent = get_merge_parent(m.buf);
1572                        if (!parent)
1573                                die(_("Corrupt MERGE_HEAD file (%s)"), m.buf);
1574                        pptr = commit_list_append(parent, pptr);
1575                }
1576                fclose(fp);
1577                strbuf_release(&m);
1578                if (!stat(git_path_merge_mode(), &statbuf)) {
1579                        if (strbuf_read_file(&sb, git_path_merge_mode(), 0) < 0)
1580                                die_errno(_("could not read MERGE_MODE"));
1581                        if (!strcmp(sb.buf, "no-ff"))
1582                                allow_fast_forward = 0;
1583                }
1584                if (allow_fast_forward)
1585                        reduce_heads_replace(&parents);
1586        } else {
1587                if (!reflog_msg)
1588                        reflog_msg = (whence == FROM_CHERRY_PICK)
1589                                        ? "commit (cherry-pick)"
1590                                        : "commit";
1591                commit_list_insert(current_head, &parents);
1592        }
1593
1594        /* Finally, get the commit message */
1595        strbuf_reset(&sb);
1596        if (strbuf_read_file(&sb, git_path_commit_editmsg(), 0) < 0) {
1597                int saved_errno = errno;
1598                rollback_index_files();
1599                die(_("could not read commit message: %s"), strerror(saved_errno));
1600        }
1601
1602        if (verbose || /* Truncate the message just before the diff, if any. */
1603            cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
1604                strbuf_setlen(&sb, wt_status_locate_end(sb.buf, sb.len));
1605        if (cleanup_mode != COMMIT_MSG_CLEANUP_NONE)
1606                strbuf_stripspace(&sb, cleanup_mode == COMMIT_MSG_CLEANUP_ALL);
1607
1608        if (message_is_empty(&sb, cleanup_mode) && !allow_empty_message) {
1609                rollback_index_files();
1610                fprintf(stderr, _("Aborting commit due to empty commit message.\n"));
1611                exit(1);
1612        }
1613        if (template_untouched(&sb, template_file, cleanup_mode) && !allow_empty_message) {
1614                rollback_index_files();
1615                fprintf(stderr, _("Aborting commit; you did not edit the message.\n"));
1616                exit(1);
1617        }
1618
1619        if (amend) {
1620                const char *exclude_gpgsig[2] = { "gpgsig", NULL };
1621                extra = read_commit_extra_headers(current_head, exclude_gpgsig);
1622        } else {
1623                struct commit_extra_header **tail = &extra;
1624                append_merge_tag_headers(parents, &tail);
1625        }
1626
1627        if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
1628                                 parents, &oid, author_ident.buf, sign_commit,
1629                                 extra)) {
1630                rollback_index_files();
1631                die(_("failed to write commit object"));
1632        }
1633        strbuf_release(&author_ident);
1634        free_commit_extra_headers(extra);
1635
1636        if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb,
1637                                    &err)) {
1638                rollback_index_files();
1639                die("%s", err.buf);
1640        }
1641
1642        unlink(git_path_cherry_pick_head());
1643        unlink(git_path_revert_head());
1644        unlink(git_path_merge_head());
1645        unlink(git_path_merge_msg());
1646        unlink(git_path_merge_mode());
1647        unlink(git_path_squash_msg());
1648
1649        if (commit_index_files())
1650                die(_("repository has been updated, but unable to write\n"
1651                      "new_index file. Check that disk is not full and quota is\n"
1652                      "not exceeded, and then \"git reset HEAD\" to recover."));
1653
1654        rerere(0);
1655        run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
1656        run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
1657        if (amend && !no_post_rewrite) {
1658                commit_post_rewrite(current_head, &oid);
1659        }
1660        if (!quiet) {
1661                unsigned int flags = 0;
1662
1663                if (!current_head)
1664                        flags |= SUMMARY_INITIAL_COMMIT;
1665                if (author_date_is_interesting())
1666                        flags |= SUMMARY_SHOW_AUTHOR_DATE;
1667                print_commit_summary(prefix, &oid, flags);
1668        }
1669
1670        UNLEAK(err);
1671        UNLEAK(sb);
1672        return 0;
1673}