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