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