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;
  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
  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
 116 static 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
 131 static 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  */
 154 static 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 (!pathspec_match(pattern, m, ce->name, 0))
 172                         continue;
 173                 string_list_insert(ce->name, list);
 174         }
 175
 176         return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
 177 }
 178
 179 static 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
 194 static 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
 222 static 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
 344 static 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
 367 static int run_hook(const char *index_file, const char *name, ...)
 368 {
 369         struct child_process hook;
 370         const char *argv[10], *env[2];
 371         char index[PATH_MAX];
 372         va_list args;
 373         int i;
 374
 375         va_start(args, name);
 376         argv[0] = git_path("hooks/%s", name);
 377         i = 0;
 378         do {
 379                 if (++i >= ARRAY_SIZE(argv))
 380                         die ("run_hook(): too many arguments");
 381                 argv[i] = va_arg(args, const char *);
 382         } while (argv[i]);
 383         va_end(args);
 384
 385         snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
 386         env[0] = index;
 387         env[1] = NULL;
 388
 389         if (access(argv[0], X_OK) < 0)
 390                 return 0;
 391
 392         memset(&hook, 0, sizeof(hook));
 393         hook.argv = argv;
 394         hook.no_stdin = 1;
 395         hook.stdout_to_stderr = 1;
 396         hook.env = env;
 397
 398         return run_command(&hook);
 399 }
 400
 401 static int is_a_merge(const unsigned char *sha1)
 402 {
 403         struct commit *commit = lookup_commit(sha1);
 404         if (!commit || parse_commit(commit))
 405                 die("could not parse HEAD commit");
 406         return !!(commit->parents && commit->parents->next);
 407 }
 408
 409 static const char sign_off_header[] = "Signed-off-by: ";
 410
 411 static void determine_author_info(void)
 412 {
 413         char *name, *email, *date;
 414
 415         name = getenv("GIT_AUTHOR_NAME");
 416         email = getenv("GIT_AUTHOR_EMAIL");
 417         date = getenv("GIT_AUTHOR_DATE");
 418
 419         if (use_message) {
 420                 const char *a, *lb, *rb, *eol;
 421
 422                 a = strstr(use_message_buffer, "\nauthor ");
 423                 if (!a)
 424                         die("invalid commit: %s", use_message);
 425
 426                 lb = strstr(a + 8, " <");
 427                 rb = strstr(a + 8, "> ");
 428                 eol = strchr(a + 8, '\n');
 429                 if (!lb || !rb || !eol)
 430                         die("invalid commit: %s", use_message);
 431
 432                 name = xstrndup(a + 8, lb - (a + 8));
 433                 email = xstrndup(lb + 2, rb - (lb + 2));
 434                 date = xstrndup(rb + 2, eol - (rb + 2));
 435         }
 436
 437         if (force_author) {
 438                 const char *lb = strstr(force_author, " <");
 439                 const char *rb = strchr(force_author, '>');
 440
 441                 if (!lb || !rb)
 442                         die("malformed --author parameter");
 443                 name = xstrndup(force_author, lb - force_author);
 444                 email = xstrndup(lb + 2, rb - (lb + 2));
 445         }
 446
 447         author_name = name;
 448         author_email = email;
 449         author_date = date;
 450 }
 451
 452 static int prepare_to_commit(const char *index_file, const char *prefix)
 453 {
 454         struct stat statbuf;
 455         int commitable, saved_color_setting;
 456         struct strbuf sb = STRBUF_INIT;
 457         char *buffer;
 458         FILE *fp;
 459         const char *hook_arg1 = NULL;
 460         const char *hook_arg2 = NULL;
 461         int ident_shown = 0;
 462
 463         if (!no_verify && run_hook(index_file, "pre-commit", NULL))
 464                 return 0;
 465
 466         if (message.len) {
 467                 strbuf_addbuf(&sb, &message);
 468                 hook_arg1 = "message";
 469         } else if (logfile && !strcmp(logfile, "-")) {
 470                 if (isatty(0))
 471                         fprintf(stderr, "(reading log message from standard input)\n");
 472                 if (strbuf_read(&sb, 0, 0) < 0)
 473                         die("could not read log from standard input");
 474                 hook_arg1 = "message";
 475         } else if (logfile) {
 476                 if (strbuf_read_file(&sb, logfile, 0) < 0)
 477                         die("could not read log file '%s': %s",
 478                             logfile, strerror(errno));
 479                 hook_arg1 = "message";
 480         } else if (use_message) {
 481                 buffer = strstr(use_message_buffer, "\n\n");
 482                 if (!buffer || buffer[2] == '\0')
 483                         die("commit has empty message");
 484                 strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
 485                 hook_arg1 = "commit";
 486                 hook_arg2 = use_message;
 487         } else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
 488                 if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
 489                         die("could not read MERGE_MSG: %s", strerror(errno));
 490                 hook_arg1 = "merge";
 491         } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
 492                 if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
 493                         die("could not read SQUASH_MSG: %s", strerror(errno));
 494                 hook_arg1 = "squash";
 495         } else if (template_file && !stat(template_file, &statbuf)) {
 496                 if (strbuf_read_file(&sb, template_file, 0) < 0)
 497                         die("could not read %s: %s",
 498                             template_file, strerror(errno));
 499                 hook_arg1 = "template";
 500         }
 501
 502         /*
 503          * This final case does not modify the template message,
 504          * it just sets the argument to the prepare-commit-msg hook.
 505          */
 506         else if (in_merge)
 507                 hook_arg1 = "merge";
 508
 509         fp = fopen(git_path(commit_editmsg), "w");
 510         if (fp == NULL)
 511                 die("could not open %s: %s",
 512                     git_path(commit_editmsg), strerror(errno));
 513
 514         if (cleanup_mode != CLEANUP_NONE)
 515                 stripspace(&sb, 0);
 516
 517         if (signoff) {
 518                 struct strbuf sob = STRBUF_INIT;
 519                 int i;
 520
 521                 strbuf_addstr(&sob, sign_off_header);
 522                 strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
 523                                              getenv("GIT_COMMITTER_EMAIL")));
 524                 strbuf_addch(&sob, '\n');
 525                 for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
 526                         ; /* do nothing */
 527                 if (prefixcmp(sb.buf + i, sob.buf)) {
 528                         if (prefixcmp(sb.buf + i, sign_off_header))
 529                                 strbuf_addch(&sb, '\n');
 530                         strbuf_addbuf(&sb, &sob);
 531                 }
 532                 strbuf_release(&sob);
 533         }
 534
 535         if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
 536                 die("could not write commit template: %s", strerror(errno));
 537
 538         strbuf_release(&sb);
 539
 540         determine_author_info();
 541
 542         /* This checks if committer ident is explicitly given */
 543         git_committer_info(0);
 544         if (use_editor) {
 545                 char *author_ident;
 546                 const char *committer_ident;
 547
 548                 if (in_merge)
 549                         fprintf(fp,
 550                                 "#\n"
 551                                 "# It looks like you may be committing a MERGE.\n"
 552                                 "# If this is not correct, please remove the file\n"
 553                                 "#      %s\n"
 554                                 "# and try again.\n"
 555                                 "#\n",
 556                                 git_path("MERGE_HEAD"));
 557
 558                 fprintf(fp,
 559                         "\n"
 560                         "# Please enter the commit message for your changes.");
 561                 if (cleanup_mode == CLEANUP_ALL)
 562                         fprintf(fp,
 563                                 " Lines starting\n"
 564                                 "# with '#' will be ignored, and an empty"
 565                                 " message aborts the commit.\n");
 566                 else /* CLEANUP_SPACE, that is. */
 567                         fprintf(fp,
 568                                 " Lines starting\n"
 569                                 "# with '#' will be kept; you may remove them"
 570                                 " yourself if you want to.\n"
 571                                 "# An empty message aborts the commit.\n");
 572                 if (only_include_assumed)
 573                         fprintf(fp, "# %s\n", only_include_assumed);
 574
 575                 author_ident = xstrdup(fmt_name(author_name, author_email));
 576                 committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"),
 577                                            getenv("GIT_COMMITTER_EMAIL"));
 578                 if (strcmp(author_ident, committer_ident))
 579                         fprintf(fp,
 580                                 "%s"
 581                                 "# Author:    %s\n",
 582                                 ident_shown++ ? "" : "#\n",
 583                                 author_ident);
 584                 free(author_ident);
 585
 586                 if (!user_ident_explicitly_given)
 587                         fprintf(fp,
 588                                 "%s"
 589                                 "# Committer: %s\n",
 590                                 ident_shown++ ? "" : "#\n",
 591                                 committer_ident);
 592
 593                 if (ident_shown)
 594                         fprintf(fp, "#\n");
 595
 596                 saved_color_setting = wt_status_use_color;
 597                 wt_status_use_color = 0;
 598                 commitable = run_status(fp, index_file, prefix, 1);
 599                 wt_status_use_color = saved_color_setting;
 600         } else {
 601                 struct rev_info rev;
 602                 unsigned char sha1[20];
 603                 const char *parent = "HEAD";
 604
 605                 if (!active_nr && read_cache() < 0)
 606                         die("Cannot read index");
 607
 608                 if (amend)
 609                         parent = "HEAD^1";
 610
 611                 if (get_sha1(parent, sha1))
 612                         commitable = !!active_nr;
 613                 else {
 614                         init_revisions(&rev, "");
 615                         rev.abbrev = 0;
 616                         setup_revisions(0, NULL, &rev, parent);
 617                         DIFF_OPT_SET(&rev.diffopt, QUIET);
 618                         DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
 619                         run_diff_index(&rev, 1 /* cached */);
 620
 621                         commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
 622                 }
 623         }
 624
 625         fclose(fp);
 626
 627         if (!commitable && !in_merge && !allow_empty &&
 628             !(amend && is_a_merge(head_sha1))) {
 629                 run_status(stdout, index_file, prefix, 0);
 630                 return 0;
 631         }
 632
 633         /*
 634          * Re-read the index as pre-commit hook could have updated it,
 635          * and write it out as a tree.  We must do this before we invoke
 636          * the editor and after we invoke run_status above.
 637          */
 638         discard_cache();
 639         read_cache_from(index_file);
 640         if (!active_cache_tree)
 641                 active_cache_tree = cache_tree();
 642         if (cache_tree_update(active_cache_tree,
 643                               active_cache, active_nr, 0, 0) < 0) {
 644                 error("Error building trees");
 645                 return 0;
 646         }
 647
 648         if (run_hook(index_file, "prepare-commit-msg",
 649                      git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
 650                 return 0;
 651
 652         if (use_editor) {
 653                 char index[PATH_MAX];
 654                 const char *env[2] = { index, NULL };
 655                 snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
 656                 if (launch_editor(git_path(commit_editmsg), NULL, env)) {
 657                         fprintf(stderr,
 658                         "Please supply the message using either -m or -F option.\n");
 659                         exit(1);
 660                 }
 661         }
 662
 663         if (!no_verify &&
 664             run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
 665                 return 0;
 666         }
 667
 668         return 1;
 669 }
 670
 671 /*
 672  * Find out if the message in the strbuf contains only whitespace and
 673  * Signed-off-by lines.
 674  */
 675 static int message_is_empty(struct strbuf *sb)
 676 {
 677         struct strbuf tmpl = STRBUF_INIT;
 678         const char *nl;
 679         int eol, i, start = 0;
 680
 681         if (cleanup_mode == CLEANUP_NONE && sb->len)
 682                 return 0;
 683
 684         /* See if the template is just a prefix of the message. */
 685         if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
 686                 stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);
 687                 if (start + tmpl.len <= sb->len &&
 688                     memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
 689                         start += tmpl.len;
 690         }
 691         strbuf_release(&tmpl);
 692
 693         /* Check if the rest is just whitespace and Signed-of-by's. */
 694         for (i = start; i < sb->len; i++) {
 695                 nl = memchr(sb->buf + i, '\n', sb->len - i);
 696                 if (nl)
 697                         eol = nl - sb->buf;
 698                 else
 699                         eol = sb->len;
 700
 701                 if (strlen(sign_off_header) <= eol - i &&
 702                     !prefixcmp(sb->buf + i, sign_off_header)) {
 703                         i = eol;
 704                         continue;
 705                 }
 706                 while (i < eol)
 707                         if (!isspace(sb->buf[i++]))
 708                                 return 0;
 709         }
 710
 711         return 1;
 712 }
 713
 714 static const char *find_author_by_nickname(const char *name)
 715 {
 716         struct rev_info revs;
 717         struct commit *commit;
 718         struct strbuf buf = STRBUF_INIT;
 719         const char *av[20];
 720         int ac = 0;
 721
 722         init_revisions(&revs, NULL);
 723         strbuf_addf(&buf, "--author=%s", name);
 724         av[++ac] = "--all";
 725         av[++ac] = "-i";
 726         av[++ac] = buf.buf;
 727         av[++ac] = NULL;
 728         setup_revisions(ac, av, &revs, NULL);
 729         prepare_revision_walk(&revs);
 730         commit = get_revision(&revs);
 731         if (commit) {
 732                 strbuf_release(&buf);
 733                 format_commit_message(commit, "%an <%ae>", &buf, DATE_NORMAL);
 734                 return strbuf_detach(&buf, NULL);
 735         }
 736         die("No existing author found with '%s'", name);
 737 }
 738
 739 static int parse_and_validate_options(int argc, const char *argv[],
 740                                       const char * const usage[],
 741                                       const char *prefix)
 742 {
 743         int f = 0;
 744
 745         argc = parse_options(argc, argv, builtin_commit_options, usage, 0);
 746         logfile = parse_options_fix_filename(prefix, logfile);
 747         template_file = parse_options_fix_filename(prefix, template_file);
 748
 749         if (force_author && !strchr(force_author, '>'))
 750                 force_author = find_author_by_nickname(force_author);
 751
 752         if (logfile || message.len || use_message)
 753                 use_editor = 0;
 754         if (edit_flag)
 755                 use_editor = 1;
 756         if (!use_editor)
 757                 setenv("GIT_EDITOR", ":", 1);
 758
 759         if (get_sha1("HEAD", head_sha1))
 760                 initial_commit = 1;
 761
 762         if (!get_sha1("MERGE_HEAD", merge_head_sha1))
 763                 in_merge = 1;
 764
 765         /* Sanity check options */
 766         if (amend && initial_commit)
 767                 die("You have nothing to amend.");
 768         if (amend && in_merge)
 769                 die("You are in the middle of a merge -- cannot amend.");
 770
 771         if (use_message)
 772                 f++;
 773         if (edit_message)
 774                 f++;
 775         if (logfile)
 776                 f++;
 777         if (f > 1)
 778                 die("Only one of -c/-C/-F can be used.");
 779         if (message.len && f > 0)
 780                 die("Option -m cannot be combined with -c/-C/-F.");
 781         if (edit_message)
 782                 use_message = edit_message;
 783         if (amend && !use_message)
 784                 use_message = "HEAD";
 785         if (use_message) {
 786                 unsigned char sha1[20];
 787                 static char utf8[] = "UTF-8";
 788                 const char *out_enc;
 789                 char *enc, *end;
 790                 struct commit *commit;
 791
 792                 if (get_sha1(use_message, sha1))
 793                         die("could not lookup commit %s", use_message);
 794                 commit = lookup_commit_reference(sha1);
 795                 if (!commit || parse_commit(commit))
 796                         die("could not parse commit %s", use_message);
 797
 798                 enc = strstr(commit->buffer, "\nencoding");
 799                 if (enc) {
 800                         end = strchr(enc + 10, '\n');
 801                         enc = xstrndup(enc + 10, end - (enc + 10));
 802                 } else {
 803                         enc = utf8;
 804                 }
 805                 out_enc = git_commit_encoding ? git_commit_encoding : utf8;
 806
 807                 if (strcmp(out_enc, enc))
 808                         use_message_buffer =
 809                                 reencode_string(commit->buffer, out_enc, enc);
 810
 811                 /*
 812                  * If we failed to reencode the buffer, just copy it
 813                  * byte for byte so the user can try to fix it up.
 814                  * This also handles the case where input and output
 815                  * encodings are identical.
 816                  */
 817                 if (use_message_buffer == NULL)
 818                         use_message_buffer = xstrdup(commit->buffer);
 819                 if (enc != utf8)
 820                         free(enc);
 821         }
 822
 823         if (!!also + !!only + !!all + !!interactive > 1)
 824                 die("Only one of --include/--only/--all/--interactive can be used.");
 825         if (argc == 0 && (also || (only && !amend)))
 826                 die("No paths with --include/--only does not make sense.");
 827         if (argc == 0 && only && amend)
 828                 only_include_assumed = "Clever... amending the last one with dirty index.";
 829         if (argc > 0 && !also && !only)
 830                 only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
 831         if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
 832                 cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
 833         else if (!strcmp(cleanup_arg, "verbatim"))
 834                 cleanup_mode = CLEANUP_NONE;
 835         else if (!strcmp(cleanup_arg, "whitespace"))
 836                 cleanup_mode = CLEANUP_SPACE;
 837         else if (!strcmp(cleanup_arg, "strip"))
 838                 cleanup_mode = CLEANUP_ALL;
 839         else
 840                 die("Invalid cleanup mode %s", cleanup_arg);
 841
 842         if (!untracked_files_arg)
 843                 ; /* default already initialized */
 844         else if (!strcmp(untracked_files_arg, "no"))
 845                 show_untracked_files = SHOW_NO_UNTRACKED_FILES;
 846         else if (!strcmp(untracked_files_arg, "normal"))
 847                 show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
 848         else if (!strcmp(untracked_files_arg, "all"))
 849                 show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
 850         else
 851                 die("Invalid untracked files mode '%s'", untracked_files_arg);
 852
 853         if (all && argc > 0)
 854                 die("Paths with -a does not make sense.");
 855         else if (interactive && argc > 0)
 856                 die("Paths with --interactive does not make sense.");
 857
 858         return argc;
 859 }
 860
 861 int cmd_status(int argc, const char **argv, const char *prefix)
 862 {
 863         const char *index_file;
 864         int commitable;
 865
 866         git_config(git_status_config, NULL);
 867
 868         if (wt_status_use_color == -1)
 869                 wt_status_use_color = git_use_color_default;
 870
 871         if (diff_use_color_default == -1)
 872                 diff_use_color_default = git_use_color_default;
 873
 874         argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix);
 875
 876         index_file = prepare_index(argc, argv, prefix);
 877
 878         commitable = run_status(stdout, index_file, prefix, 0);
 879
 880         rollback_index_files();
 881
 882         return commitable ? 0 : 1;
 883 }
 884
 885 static void print_summary(const char *prefix, const unsigned char *sha1)
 886 {
 887         struct rev_info rev;
 888         struct commit *commit;
 889         static const char *format = "format:%h: \"%s\"";
 890         unsigned char junk_sha1[20];
 891         const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
 892
 893         commit = lookup_commit(sha1);
 894         if (!commit)
 895                 die("couldn't look up newly created commit");
 896         if (!commit || parse_commit(commit))
 897                 die("could not parse newly created commit");
 898
 899         init_revisions(&rev, prefix);
 900         setup_revisions(0, NULL, &rev, NULL);
 901
 902         rev.abbrev = 0;
 903         rev.diff = 1;
 904         rev.diffopt.output_format =
 905                 DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
 906
 907         rev.verbose_header = 1;
 908         rev.show_root_diff = 1;
 909         get_commit_format(format, &rev);
 910         rev.always_show_header = 0;
 911         rev.diffopt.detect_rename = 1;
 912         rev.diffopt.rename_limit = 100;
 913         rev.diffopt.break_opt = 0;
 914         diff_setup_done(&rev.diffopt);
 915
 916         printf("[%s%s]: created ",
 917                 !prefixcmp(head, "refs/heads/") ?
 918                         head + 11 :
 919                         !strcmp(head, "HEAD") ?
 920                                 "detached HEAD" :
 921                                 head,
 922                 initial_commit ? " (root-commit)" : "");
 923
 924         if (!log_tree_commit(&rev, commit)) {
 925                 struct strbuf buf = STRBUF_INIT;
 926                 format_commit_message(commit, format + 7, &buf, DATE_NORMAL);
 927                 printf("%s\n", buf.buf);
 928                 strbuf_release(&buf);
 929         }
 930 }
 931
 932 static int git_commit_config(const char *k, const char *v, void *cb)
 933 {
 934         if (!strcmp(k, "commit.template"))
 935                 return git_config_string(&template_file, k, v);
 936
 937         return git_status_config(k, v, cb);
 938 }
 939
 940 int cmd_commit(int argc, const char **argv, const char *prefix)
 941 {
 942         struct strbuf sb = STRBUF_INIT;
 943         const char *index_file, *reflog_msg;
 944         char *nl, *p;
 945         unsigned char commit_sha1[20];
 946         struct ref_lock *ref_lock;
 947         struct commit_list *parents = NULL, **pptr = &parents;
 948         struct stat statbuf;
 949         int allow_fast_forward = 1;
 950
 951         git_config(git_commit_config, NULL);
 952
 953         if (wt_status_use_color == -1)
 954                 wt_status_use_color = git_use_color_default;
 955
 956         argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix);
 957
 958         index_file = prepare_index(argc, argv, prefix);
 959
 960         /* Set up everything for writing the commit object.  This includes
 961            running hooks, writing the trees, and interacting with the user.  */
 962         if (!prepare_to_commit(index_file, prefix)) {
 963                 rollback_index_files();
 964                 return 1;
 965         }
 966
 967         /* Determine parents */
 968         if (initial_commit) {
 969                 reflog_msg = "commit (initial)";
 970         } else if (amend) {
 971                 struct commit_list *c;
 972                 struct commit *commit;
 973
 974                 reflog_msg = "commit (amend)";
 975                 commit = lookup_commit(head_sha1);
 976                 if (!commit || parse_commit(commit))
 977                         die("could not parse HEAD commit");
 978
 979                 for (c = commit->parents; c; c = c->next)
 980                         pptr = &commit_list_insert(c->item, pptr)->next;
 981         } else if (in_merge) {
 982                 struct strbuf m = STRBUF_INIT;
 983                 FILE *fp;
 984
 985                 reflog_msg = "commit (merge)";
 986                 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
 987                 fp = fopen(git_path("MERGE_HEAD"), "r");
 988                 if (fp == NULL)
 989                         die("could not open %s for reading: %s",
 990                             git_path("MERGE_HEAD"), strerror(errno));
 991                 while (strbuf_getline(&m, fp, '\n') != EOF) {
 992                         unsigned char sha1[20];
 993                         if (get_sha1_hex(m.buf, sha1) < 0)
 994                                 die("Corrupt MERGE_HEAD file (%s)", m.buf);
 995                         pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
 996                 }
 997                 fclose(fp);
 998                 strbuf_release(&m);
 999                 if (!stat(git_path("MERGE_MODE"), &statbuf)) {
1000                         if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
1001                                 die("could not read MERGE_MODE: %s",
1002                                                 strerror(errno));
1003                         if (!strcmp(sb.buf, "no-ff"))
1004                                 allow_fast_forward = 0;
1005                 }
1006                 if (allow_fast_forward)
1007                         parents = reduce_heads(parents);
1008         } else {
1009                 reflog_msg = "commit";
1010                 pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
1011         }
1012
1013         /* Finally, get the commit message */
1014         strbuf_reset(&sb);
1015         if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
1016                 rollback_index_files();
1017                 die("could not read commit message");
1018         }
1019
1020         /* Truncate the message just before the diff, if any. */
1021         if (verbose) {
1022                 p = strstr(sb.buf, "\ndiff --git ");
1023                 if (p != NULL)
1024                         strbuf_setlen(&sb, p - sb.buf + 1);
1025         }
1026
1027         if (cleanup_mode != CLEANUP_NONE)
1028                 stripspace(&sb, cleanup_mode == CLEANUP_ALL);
1029         if (message_is_empty(&sb)) {
1030                 rollback_index_files();
1031                 fprintf(stderr, "Aborting commit due to empty commit message.\n");
1032                 exit(1);
1033         }
1034
1035         if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1,
1036                         fmt_ident(author_name, author_email, author_date,
1037                                 IDENT_ERROR_ON_NO_NAME))) {
1038                 rollback_index_files();
1039                 die("failed to write commit object");
1040         }
1041
1042         ref_lock = lock_any_ref_for_update("HEAD",
1043                                            initial_commit ? NULL : head_sha1,
1044                                            0);
1045
1046         nl = strchr(sb.buf, '\n');
1047         if (nl)
1048                 strbuf_setlen(&sb, nl + 1 - sb.buf);
1049         else
1050                 strbuf_addch(&sb, '\n');
1051         strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
1052         strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
1053
1054         if (!ref_lock) {
1055                 rollback_index_files();
1056                 die("cannot lock HEAD ref");
1057         }
1058         if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
1059                 rollback_index_files();
1060                 die("cannot update HEAD ref");
1061         }
1062
1063         unlink(git_path("MERGE_HEAD"));
1064         unlink(git_path("MERGE_MSG"));
1065         unlink(git_path("MERGE_MODE"));
1066         unlink(git_path("SQUASH_MSG"));
1067
1068         if (commit_index_files())
1069                 die ("Repository has been updated, but unable to write\n"
1070                      "new_index file. Check that disk is not full or quota is\n"
1071                      "not exceeded, and then \"git reset HEAD\" to recover.");
1072
1073         rerere();
1074         run_hook(get_index_file(), "post-commit", NULL);
1075         if (!quiet)
1076                 print_summary(prefix, commit_sha1);
1077
1078         return 0;
1079 }