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