builtin-commit.c

   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
  28 static const char * const builtin_commit_usage[] = {
  29         "git commit [options] [--] <filepattern>...",
  30         NULL
  31 };
  32
  33 static const char * const builtin_status_usage[] = {
  34         "git status [options] [--] <filepattern>...",
  35         NULL
  36 };
  37
  38 static unsigned char head_sha1[20], merge_head_sha1[20];
  39 static char *use_message_buffer;
  40 static const char commit_editmsg[] = "COMMIT_EDITMSG";
  41 static struct lock_file index_lock; /* real index */
  42 static struct lock_file false_lock; /* used only for partial commits */
  43 static enum {
  44         COMMIT_AS_IS = 1,
  45         COMMIT_NORMAL,
  46         COMMIT_PARTIAL,
  47 } commit_style;
  48
  49 static const char *logfile, *force_author;
  50 static const char *template_file;
  51 static char *edit_message, *use_message;
  52 static char *author_name, *author_email, *author_date;
  53 static int all, edit_flag, also, interactive, only, amend, signoff;
  54 static int quiet, verbose, no_verify, allow_empty, dry_run;
  55 static 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  */
  63 static enum {
  64         CLEANUP_SPACE,
  65         CLEANUP_NONE,
  66         CLEANUP_ALL,
  67 } cleanup_mode;
  68 static char *cleanup_arg;
  69
  70 static int use_editor = 1, initial_commit, in_merge;
  71 static const char *only_include_assumed;
  72 static struct strbuf message;
  73
  74 static 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
  86 static struct option builtin_commit_options[] = {
  87         OPT__QUIET(&quiet),
  88         OPT__VERBOSE(&verbose),
  89         OPT_GROUP("Commit message options"),
  90
  91         OPT_FILENAME('F', "file", &logfile, "read log from file"),
  92         OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
  93         OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
  94         OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
  95         OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
  96         OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
  97         OPT_FILENAME('t', "template", &template_file, "use specified template file"),
  98         OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
  99
 100         OPT_GROUP("Commit contents options"),
 101         OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
 102         OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
 103         OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
 104         OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
 105         OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
 106         OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
 107         OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
 108         { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
 109         OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
 110         OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
 111
 112         OPT_END()
 113 };
 114
 115 static void rollback_index_files(void)
 116 {
 117         switch (commit_style) {
 118         case COMMIT_AS_IS:
 119                 break; /* nothing to do */
 120         case COMMIT_NORMAL:
 121                 rollback_lock_file(&index_lock);
 122                 break;
 123         case COMMIT_PARTIAL:
 124                 rollback_lock_file(&index_lock);
 125                 rollback_lock_file(&false_lock);
 126                 break;
 127         }
 128 }
 129
 130 static int commit_index_files(void)
 131 {
 132         int err = 0;
 133
 134         switch (commit_style) {
 135         case COMMIT_AS_IS:
 136                 break; /* nothing to do */
 137         case COMMIT_NORMAL:
 138                 err = commit_lock_file(&index_lock);
 139                 break;
 140         case COMMIT_PARTIAL:
 141                 err = commit_lock_file(&index_lock);
 142                 rollback_lock_file(&false_lock);
 143                 break;
 144         }
 145
 146         return err;
 147 }
 148
 149 /*
 150  * Take a union of paths in the index and the named tree (typically, "HEAD"),
 151  * and return the paths that match the given pattern in list.
 152  */
 153 static int list_paths(struct string_list *list, const char *with_tree,
 154                       const char *prefix, const char **pattern)
 155 {
 156         int i;
 157         char *m;
 158
 159         for (i = 0; pattern[i]; i++)
 160                 ;
 161         m = xcalloc(1, i);
 162
 163         if (with_tree)
 164                 overlay_tree_on_cache(with_tree, prefix);
 165
 166         for (i = 0; i < active_nr; i++) {
 167                 struct cache_entry *ce = active_cache[i];
 168                 if (ce->ce_flags & CE_UPDATE)
 169                         continue;
 170                 if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
 171                         continue;
 172                 string_list_insert(ce->name, list);
 173         }
 174
 175         return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
 176 }
 177
 178 static void add_remove_files(struct string_list *list)
 179 {
 180         int i;
 181         for (i = 0; i < list->nr; i++) {
 182                 struct stat st;
 183                 struct string_list_item *p = &(list->items[i]);
 184
 185                 if (!lstat(p->string, &st)) {
 186                         if (add_to_cache(p->string, &st, 0))
 187                                 die("updating files failed");
 188                 } else
 189                         remove_file_from_cache(p->string);
 190         }
 191 }
 192
 193 static void create_base_index(void)
 194 {
 195         struct tree *tree;
 196         struct unpack_trees_options opts;
 197         struct tree_desc t;
 198
 199         if (initial_commit) {
 200                 discard_cache();
 201                 return;
 202         }
 203
 204         memset(&opts, 0, sizeof(opts));
 205         opts.head_idx = 1;
 206         opts.index_only = 1;
 207         opts.merge = 1;
 208         opts.src_index = &the_index;
 209         opts.dst_index = &the_index;
 210
 211         opts.fn = oneway_merge;
 212         tree = parse_tree_indirect(head_sha1);
 213         if (!tree)
 214                 die("failed to unpack HEAD tree object");
 215         parse_tree(tree);
 216         init_tree_desc(&t, tree->buffer, tree->size);
 217         if (unpack_trees(1, &t, &opts))
 218                 exit(128); /* We've already reported the error, finish dying */
 219 }
 220
 221 static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status)
 222 {
 223         int fd;
 224         struct string_list partial;
 225         const char **pathspec = NULL;
 226         int refresh_flags = REFRESH_QUIET;
 227
 228         if (is_status)
 229                 refresh_flags |= REFRESH_UNMERGED;
 230         if (interactive) {
 231                 if (interactive_add(argc, argv, prefix) != 0)
 232                         die("interactive add failed");
 233                 if (read_cache_preload(NULL) < 0)
 234                         die("index file corrupt");
 235                 commit_style = COMMIT_AS_IS;
 236                 return get_index_file();
 237         }
 238
 239         if (*argv)
 240                 pathspec = get_pathspec(prefix, argv);
 241
 242         if (read_cache_preload(pathspec) < 0)
 243                 die("index file corrupt");
 244
 245         /*
 246          * Non partial, non as-is commit.
 247          *
 248          * (1) get the real index;
 249          * (2) update the_index as necessary;
 250          * (3) write the_index out to the real index (still locked);
 251          * (4) return the name of the locked index file.
 252          *
 253          * The caller should run hooks on the locked real index, and
 254          * (A) if all goes well, commit the real index;
 255          * (B) on failure, rollback the real index.
 256          */
 257         if (all || (also && pathspec && *pathspec)) {
 258                 int fd = hold_locked_index(&index_lock, 1);
 259                 add_files_to_cache(also ? prefix : NULL, pathspec, 0);
 260                 refresh_cache(refresh_flags);
 261                 if (write_cache(fd, active_cache, active_nr) ||
 262                     close_lock_file(&index_lock))
 263                         die("unable to write new_index file");
 264                 commit_style = COMMIT_NORMAL;
 265                 return index_lock.filename;
 266         }
 267
 268         /*
 269          * As-is commit.
 270          *
 271          * (1) return the name of the real index file.
 272          *
 273          * The caller should run hooks on the real index, and run
 274          * hooks on the real index, and create commit from the_index.
 275          * We still need to refresh the index here.
 276          */
 277         if (!pathspec || !*pathspec) {
 278                 fd = hold_locked_index(&index_lock, 1);
 279                 refresh_cache(refresh_flags);
 280                 if (write_cache(fd, active_cache, active_nr) ||
 281                     commit_locked_index(&index_lock))
 282                         die("unable to write new_index file");
 283                 commit_style = COMMIT_AS_IS;
 284                 return get_index_file();
 285         }
 286
 287         /*
 288          * A partial commit.
 289          *
 290          * (0) find the set of affected paths;
 291          * (1) get lock on the real index file;
 292          * (2) update the_index with the given paths;
 293          * (3) write the_index out to the real index (still locked);
 294          * (4) get lock on the false index file;
 295          * (5) reset the_index from HEAD;
 296          * (6) update the_index the same way as (2);
 297          * (7) write the_index out to the false index file;
 298          * (8) return the name of the false index file (still locked);
 299          *
 300          * The caller should run hooks on the locked false index, and
 301          * create commit from it.  Then
 302          * (A) if all goes well, commit the real index;
 303          * (B) on failure, rollback the real index;
 304          * In either case, rollback the false index.
 305          */
 306         commit_style = COMMIT_PARTIAL;
 307
 308         if (file_exists(git_path("MERGE_HEAD")))
 309                 die("cannot do a partial commit during a merge.");
 310
 311         memset(&partial, 0, sizeof(partial));
 312         partial.strdup_strings = 1;
 313         if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
 314                 exit(1);
 315
 316         discard_cache();
 317         if (read_cache() < 0)
 318                 die("cannot read the index");
 319
 320         fd = hold_locked_index(&index_lock, 1);
 321         add_remove_files(&partial);
 322         refresh_cache(REFRESH_QUIET);
 323         if (write_cache(fd, active_cache, active_nr) ||
 324             close_lock_file(&index_lock))
 325                 die("unable to write new_index file");
 326
 327         fd = hold_lock_file_for_update(&false_lock,
 328                                        git_path("next-index-%"PRIuMAX,
 329                                                 (uintmax_t) getpid()),
 330                                        LOCK_DIE_ON_ERROR);
 331
 332         create_base_index();
 333         add_remove_files(&partial);
 334         refresh_cache(REFRESH_QUIET);
 335
 336         if (write_cache(fd, active_cache, active_nr) ||
 337             close_lock_file(&false_lock))
 338                 die("unable to write temporary index file");
 339
 340         discard_cache();
 341         read_cache_from(false_lock.filename);
 342
 343         return false_lock.filename;
 344 }
 345
 346 static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn)
 347 {
 348         struct wt_status s;
 349
 350         wt_status_prepare(&s);
 351         if (wt_status_relative_paths)
 352                 s.prefix = prefix;
 353
 354         if (amend) {
 355                 s.amend = 1;
 356                 s.reference = "HEAD^1";
 357         }
 358         s.verbose = verbose;
 359         s.untracked = (show_untracked_files == SHOW_ALL_UNTRACKED_FILES);
 360         s.index_file = index_file;
 361         s.fp = fp;
 362         s.nowarn = nowarn;
 363
 364         wt_status_print(&s);
 365
 366         return s.commitable;
 367 }
 368
 369 static int is_a_merge(const unsigned char *sha1)
 370 {
 371         struct commit *commit = lookup_commit(sha1);
 372         if (!commit || parse_commit(commit))
 373                 die("could not parse HEAD commit");
 374         return !!(commit->parents && commit->parents->next);
 375 }
 376
 377 static const char sign_off_header[] = "Signed-off-by: ";
 378
 379 static void determine_author_info(void)
 380 {
 381         char *name, *email, *date;
 382
 383         name = getenv("GIT_AUTHOR_NAME");
 384         email = getenv("GIT_AUTHOR_EMAIL");
 385         date = getenv("GIT_AUTHOR_DATE");
 386
 387         if (use_message) {
 388                 const char *a, *lb, *rb, *eol;
 389
 390                 a = strstr(use_message_buffer, "\nauthor ");
 391                 if (!a)
 392                         die("invalid commit: %s", use_message);
 393
 394                 lb = strstr(a + 8, " <");
 395                 rb = strstr(a + 8, "> ");
 396                 eol = strchr(a + 8, '\n');
 397                 if (!lb || !rb || !eol)
 398                         die("invalid commit: %s", use_message);
 399
 400                 name = xstrndup(a + 8, lb - (a + 8));
 401                 email = xstrndup(lb + 2, rb - (lb + 2));
 402                 date = xstrndup(rb + 2, eol - (rb + 2));
 403         }
 404
 405         if (force_author) {
 406                 const char *lb = strstr(force_author, " <");
 407                 const char *rb = strchr(force_author, '>');
 408
 409                 if (!lb || !rb)
 410                         die("malformed --author parameter");
 411                 name = xstrndup(force_author, lb - force_author);
 412                 email = xstrndup(lb + 2, rb - (lb + 2));
 413         }
 414
 415         author_name = name;
 416         author_email = email;
 417         author_date = date;
 418 }
 419
 420 static int prepare_to_commit(const char *index_file, const char *prefix)
 421 {
 422         struct stat statbuf;
 423         int commitable, saved_color_setting;
 424         struct strbuf sb = STRBUF_INIT;
 425         char *buffer;
 426         FILE *fp;
 427         const char *hook_arg1 = NULL;
 428         const char *hook_arg2 = NULL;
 429         int ident_shown = 0;
 430
 431         if (!no_verify && run_hook(index_file, "pre-commit", NULL))
 432                 return 0;
 433
 434         if (message.len) {
 435                 strbuf_addbuf(&sb, &message);
 436                 hook_arg1 = "message";
 437         } else if (logfile && !strcmp(logfile, "-")) {
 438                 if (isatty(0))
 439                         fprintf(stderr, "(reading log message from standard input)\n");
 440                 if (strbuf_read(&sb, 0, 0) < 0)
 441                         die_errno("could not read log from standard input");
 442                 hook_arg1 = "message";
 443         } else if (logfile) {
 444                 if (strbuf_read_file(&sb, logfile, 0) < 0)
 445                         die_errno("could not read log file '%s'",
 446                                   logfile);
 447                 hook_arg1 = "message";
 448         } else if (use_message) {
 449                 buffer = strstr(use_message_buffer, "\n\n");
 450                 if (!buffer || buffer[2] == '\0')
 451                         die("commit has empty message");
 452                 strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
 453                 hook_arg1 = "commit";
 454                 hook_arg2 = use_message;
 455         } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
 456                 if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
 457                         die_errno("could not read MERGE_MSG");
 458                 hook_arg1 = "merge";
 459         } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
 460                 if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
 461                         die_errno("could not read SQUASH_MSG");
 462                 hook_arg1 = "squash";
 463         } else if (template_file && !stat(template_file, &statbuf)) {
 464                 if (strbuf_read_file(&sb, template_file, 0) < 0)
 465                         die_errno("could not read '%s'", template_file);
 466                 hook_arg1 = "template";
 467         }
 468
 469         /*
 470          * This final case does not modify the template message,
 471          * it just sets the argument to the prepare-commit-msg hook.
 472          */
 473         else if (in_merge)
 474                 hook_arg1 = "merge";
 475
 476         fp = fopen(git_path(commit_editmsg), "w");
 477         if (fp == NULL)
 478                 die_errno("could not open '%s'", git_path(commit_editmsg));
 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_errno("could not write commit template");
 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  */
 632 static 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
 671 static 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
 696 static 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, prefix, builtin_commit_options, usage,
 703                              0);
 704
 705         if (force_author && !strchr(force_author, '>'))
 706                 force_author = find_author_by_nickname(force_author);
 707
 708         if (logfile || message.len || use_message)
 709                 use_editor = 0;
 710         if (edit_flag)
 711                 use_editor = 1;
 712         if (!use_editor)
 713                 setenv("GIT_EDITOR", ":", 1);
 714
 715         if (get_sha1("HEAD", head_sha1))
 716                 initial_commit = 1;
 717
 718         if (!get_sha1("MERGE_HEAD", merge_head_sha1))
 719                 in_merge = 1;
 720
 721         /* Sanity check options */
 722         if (amend && initial_commit)
 723                 die("You have nothing to amend.");
 724         if (amend && in_merge)
 725                 die("You are in the middle of a merge -- cannot amend.");
 726
 727         if (use_message)
 728                 f++;
 729         if (edit_message)
 730                 f++;
 731         if (logfile)
 732                 f++;
 733         if (f > 1)
 734                 die("Only one of -c/-C/-F can be used.");
 735         if (message.len && f > 0)
 736                 die("Option -m cannot be combined with -c/-C/-F.");
 737         if (edit_message)
 738                 use_message = edit_message;
 739         if (amend && !use_message)
 740                 use_message = "HEAD";
 741         if (use_message) {
 742                 unsigned char sha1[20];
 743                 static char utf8[] = "UTF-8";
 744                 const char *out_enc;
 745                 char *enc, *end;
 746                 struct commit *commit;
 747
 748                 if (get_sha1(use_message, sha1))
 749                         die("could not lookup commit %s", use_message);
 750                 commit = lookup_commit_reference(sha1);
 751                 if (!commit || parse_commit(commit))
 752                         die("could not parse commit %s", use_message);
 753
 754                 enc = strstr(commit->buffer, "\nencoding");
 755                 if (enc) {
 756                         end = strchr(enc + 10, '\n');
 757                         enc = xstrndup(enc + 10, end - (enc + 10));
 758                 } else {
 759                         enc = utf8;
 760                 }
 761                 out_enc = git_commit_encoding ? git_commit_encoding : utf8;
 762
 763                 if (strcmp(out_enc, enc))
 764                         use_message_buffer =
 765                                 reencode_string(commit->buffer, out_enc, enc);
 766
 767                 /*
 768                  * If we failed to reencode the buffer, just copy it
 769                  * byte for byte so the user can try to fix it up.
 770                  * This also handles the case where input and output
 771                  * encodings are identical.
 772                  */
 773                 if (use_message_buffer == NULL)
 774                         use_message_buffer = xstrdup(commit->buffer);
 775                 if (enc != utf8)
 776                         free(enc);
 777         }
 778
 779         if (!!also + !!only + !!all + !!interactive > 1)
 780                 die("Only one of --include/--only/--all/--interactive can be used.");
 781         if (argc == 0 && (also || (only && !amend)))
 782                 die("No paths with --include/--only does not make sense.");
 783         if (argc == 0 && only && amend)
 784                 only_include_assumed = "Clever... amending the last one with dirty index.";
 785         if (argc > 0 && !also && !only)
 786                 only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
 787         if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
 788                 cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
 789         else if (!strcmp(cleanup_arg, "verbatim"))
 790                 cleanup_mode = CLEANUP_NONE;
 791         else if (!strcmp(cleanup_arg, "whitespace"))
 792                 cleanup_mode = CLEANUP_SPACE;
 793         else if (!strcmp(cleanup_arg, "strip"))
 794                 cleanup_mode = CLEANUP_ALL;
 795         else
 796                 die("Invalid cleanup mode %s", cleanup_arg);
 797
 798         if (!untracked_files_arg)
 799                 ; /* default already initialized */
 800         else if (!strcmp(untracked_files_arg, "no"))
 801                 show_untracked_files = SHOW_NO_UNTRACKED_FILES;
 802         else if (!strcmp(untracked_files_arg, "normal"))
 803                 show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 804         else if (!strcmp(untracked_files_arg, "all"))
 805                 show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
 806         else
 807                 die("Invalid untracked files mode '%s'", untracked_files_arg);
 808
 809         if (all && argc > 0)
 810                 die("Paths with -a does not make sense.");
 811         else if (interactive && argc > 0)
 812                 die("Paths with --interactive does not make sense.");
 813
 814         return argc;
 815 }
 816
 817 static int dry_run_commit(int argc, const char **argv, const char *prefix)
 818 {
 819         int commitable;
 820         const char *index_file;
 821
 822         index_file = prepare_index(argc, argv, prefix, 1);
 823         commitable = run_status(stdout, index_file, prefix, 0);
 824         rollback_index_files();
 825
 826         return commitable ? 0 : 1;
 827 }
 828
 829 int cmd_status(int argc, const char **argv, const char *prefix)
 830 {
 831         git_config(git_status_config, NULL);
 832         if (wt_status_use_color == -1)
 833                 wt_status_use_color = git_use_color_default;
 834         if (diff_use_color_default == -1)
 835                 diff_use_color_default = git_use_color_default;
 836
 837         argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix);
 838         return dry_run_commit(argc, argv, prefix);
 839 }
 840
 841 static void print_summary(const char *prefix, const unsigned char *sha1)
 842 {
 843         struct rev_info rev;
 844         struct commit *commit;
 845         static const char *format = "format:%h] %s";
 846         unsigned char junk_sha1[20];
 847         const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
 848
 849         commit = lookup_commit(sha1);
 850         if (!commit)
 851                 die("couldn't look up newly created commit");
 852         if (!commit || parse_commit(commit))
 853                 die("could not parse newly created commit");
 854
 855         init_revisions(&rev, prefix);
 856         setup_revisions(0, NULL, &rev, NULL);
 857
 858         rev.abbrev = 0;
 859         rev.diff = 1;
 860         rev.diffopt.output_format =
 861                 DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
 862
 863         rev.verbose_header = 1;
 864         rev.show_root_diff = 1;
 865         get_commit_format(format, &rev);
 866         rev.always_show_header = 0;
 867         rev.diffopt.detect_rename = 1;
 868         rev.diffopt.rename_limit = 100;
 869         rev.diffopt.break_opt = 0;
 870         diff_setup_done(&rev.diffopt);
 871
 872         printf("[%s%s ",
 873                 !prefixcmp(head, "refs/heads/") ?
 874                         head + 11 :
 875                         !strcmp(head, "HEAD") ?
 876                                 "detached HEAD" :
 877                                 head,
 878                 initial_commit ? " (root-commit)" : "");
 879
 880         if (!log_tree_commit(&rev, commit)) {
 881                 struct strbuf buf = STRBUF_INIT;
 882                 format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
 883                 printf("%s\n", buf.buf);
 884                 strbuf_release(&buf);
 885         }
 886 }
 887
 888 static int git_commit_config(const char *k, const char *v, void *cb)
 889 {
 890         if (!strcmp(k, "commit.template"))
 891                 return git_config_string(&template_file, k, v);
 892
 893         return git_status_config(k, v, cb);
 894 }
 895
 896 int cmd_commit(int argc, const char **argv, const char *prefix)
 897 {
 898         struct strbuf sb = STRBUF_INIT;
 899         const char *index_file, *reflog_msg;
 900         char *nl, *p;
 901         unsigned char commit_sha1[20];
 902         struct ref_lock *ref_lock;
 903         struct commit_list *parents = NULL, **pptr = &parents;
 904         struct stat statbuf;
 905         int allow_fast_forward = 1;
 906
 907         git_config(git_commit_config, NULL);
 908
 909         if (wt_status_use_color == -1)
 910                 wt_status_use_color = git_use_color_default;
 911
 912         argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix);
 913         if (dry_run)
 914                 return dry_run_commit(argc, argv, prefix);
 915
 916         index_file = prepare_index(argc, argv, prefix, 0);
 917
 918         /* Set up everything for writing the commit object.  This includes
 919            running hooks, writing the trees, and interacting with the user.  */
 920         if (!prepare_to_commit(index_file, prefix)) {
 921                 rollback_index_files();
 922                 return 1;
 923         }
 924
 925         /* Determine parents */
 926         if (initial_commit) {
 927                 reflog_msg = "commit (initial)";
 928         } else if (amend) {
 929                 struct commit_list *c;
 930                 struct commit *commit;
 931
 932                 reflog_msg = "commit (amend)";
 933                 commit = lookup_commit(head_sha1);
 934                 if (!commit || parse_commit(commit))
 935                         die("could not parse HEAD commit");
 936
 937                 for (c = commit->parents; c; c = c->next)
 938                         pptr = &commit_list_insert(c->item, pptr)->next;
 939         } else if (in_merge) {
 940                 struct strbuf m = STRBUF_INIT;
 941                 FILE *fp;
 942
 943                 reflog_msg = "commit (merge)";
 944                 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
 945                 fp = fopen(git_path("MERGE_HEAD"), "r");
 946                 if (fp == NULL)
 947                         die_errno("could not open '%s' for reading",
 948                                   git_path("MERGE_HEAD"));
 949                 while (strbuf_getline(&m, fp, '\n') != EOF) {
 950                         unsigned char sha1[20];
 951                         if (get_sha1_hex(m.buf, sha1) < 0)
 952                                 die("Corrupt MERGE_HEAD file (%s)", m.buf);
 953                         pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
 954                 }
 955                 fclose(fp);
 956                 strbuf_release(&m);
 957                 if (!stat(git_path("MERGE_MODE"), &statbuf)) {
 958                         if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
 959                                 die_errno("could not read MERGE_MODE");
 960                         if (!strcmp(sb.buf, "no-ff"))
 961                                 allow_fast_forward = 0;
 962                 }
 963                 if (allow_fast_forward)
 964                         parents = reduce_heads(parents);
 965         } else {
 966                 reflog_msg = "commit";
 967                 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
 968         }
 969
 970         /* Finally, get the commit message */
 971         strbuf_reset(&sb);
 972         if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
 973                 int saved_errno = errno;
 974                 rollback_index_files();
 975                 die("could not read commit message: %s", strerror(saved_errno));
 976         }
 977
 978         /* Truncate the message just before the diff, if any. */
 979         if (verbose) {
 980                 p = strstr(sb.buf, "\ndiff --git ");
 981                 if (p != NULL)
 982                         strbuf_setlen(&sb, p - sb.buf + 1);
 983         }
 984
 985         if (cleanup_mode != CLEANUP_NONE)
 986                 stripspace(&sb, cleanup_mode == CLEANUP_ALL);
 987         if (message_is_empty(&sb)) {
 988                 rollback_index_files();
 989                 fprintf(stderr, "Aborting commit due to empty commit message.\n");
 990                 exit(1);
 991         }
 992
 993         if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
 994                         fmt_ident(author_name, author_email, author_date,
 995                                 IDENT_ERROR_ON_NO_NAME))) {
 996                 rollback_index_files();
 997                 die("failed to write commit object");
 998         }
 999
1000         ref_lock = lock_any_ref_for_update("HEAD",
1001                                            initial_commit ? NULL : head_sha1,
1002                                            0);
1003
1004         nl = strchr(sb.buf, '\n');
1005         if (nl)
1006                 strbuf_setlen(&sb, nl + 1 - sb.buf);
1007         else
1008                 strbuf_addch(&sb, '\n');
1009         strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1010         strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
1011
1012         if (!ref_lock) {
1013                 rollback_index_files();
1014                 die("cannot lock HEAD ref");
1015         }
1016         if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
1017                 rollback_index_files();
1018                 die("cannot update HEAD ref");
1019         }
1020
1021         unlink(git_path("MERGE_HEAD"));
1022         unlink(git_path("MERGE_MSG"));
1023         unlink(git_path("MERGE_MODE"));
1024         unlink(git_path("SQUASH_MSG"));
1025
1026         if (commit_index_files())
1027                 die ("Repository has been updated, but unable to write\n"
1028                      "new_index file. Check that disk is not full or quota is\n"
1029                      "not exceeded, and then \"git reset HEAD\" to recover.");
1030
1031         rerere();
1032         run_hook(get_index_file(), "post-commit", NULL);
1033         if (!quiet)
1034                 print_summary(prefix, commit_sha1);
1035
1036         return 0;
1037 }