4 * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
5 * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
11 #include "cache-tree.h"
19 #include "wt-status.h"
20 #include "run-command.h"
25 #include "parse-options.h"
26 #include "string-list.h"
28 #include "unpack-trees.h"
30 #include "submodule.h"
31 #include "gpg-interface.h"
33 #include "sequencer.h"
36 static const char * const builtin_commit_usage
[] = {
37 N_("git commit [<options>] [--] <pathspec>..."),
41 static const char * const builtin_status_usage
[] = {
42 N_("git status [<options>] [--] <pathspec>..."),
46 static const char empty_amend_advice
[] =
47 N_("You asked to amend the most recent commit, but doing so would make\n"
48 "it empty. You can repeat your command with --allow-empty, or you can\n"
49 "remove the commit entirely with \"git reset HEAD^\".\n");
51 static const char empty_cherry_pick_advice
[] =
52 N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
53 "If you wish to commit it anyway, use:\n"
55 " git commit --allow-empty\n"
58 static const char empty_cherry_pick_advice_single
[] =
59 N_("Otherwise, please use 'git reset'\n");
61 static const char empty_cherry_pick_advice_multi
[] =
62 N_("If you wish to skip this commit, use:\n"
66 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
67 "the remaining commits.\n");
69 static const char *color_status_slots
[] = {
70 [WT_STATUS_HEADER
] = "header",
71 [WT_STATUS_UPDATED
] = "updated",
72 [WT_STATUS_CHANGED
] = "changed",
73 [WT_STATUS_UNTRACKED
] = "untracked",
74 [WT_STATUS_NOBRANCH
] = "noBranch",
75 [WT_STATUS_UNMERGED
] = "unmerged",
76 [WT_STATUS_LOCAL_BRANCH
] = "localBranch",
77 [WT_STATUS_REMOTE_BRANCH
] = "remoteBranch",
78 [WT_STATUS_ONBRANCH
] = "branch",
81 static const char *use_message_buffer
;
82 static struct lock_file index_lock
; /* real index */
83 static struct lock_file false_lock
; /* used only for partial commits */
90 static const char *logfile
, *force_author
;
91 static const char *template_file
;
93 * The _message variables are commit names from which to take
94 * the commit message and/or authorship.
96 static const char *author_message
, *author_message_buffer
;
97 static char *edit_message
, *use_message
;
98 static char *fixup_message
, *squash_message
;
99 static int all
, also
, interactive
, patch_interactive
, only
, amend
, signoff
;
100 static int edit_flag
= -1; /* unspecified */
101 static int quiet
, verbose
, no_verify
, allow_empty
, dry_run
, renew_authorship
;
102 static int config_commit_verbose
= -1; /* unspecified */
103 static int no_post_rewrite
, allow_empty_message
;
104 static char *untracked_files_arg
, *force_date
, *ignore_submodule_arg
, *ignored_arg
;
105 static char *sign_commit
;
108 * The default commit message cleanup mode will remove the lines
109 * beginning with # (shell comments) and leading and trailing
110 * whitespaces (empty lines or containing only whitespaces)
111 * if editor is used, and only the whitespaces if the message
112 * is specified explicitly.
114 static enum commit_msg_cleanup_mode cleanup_mode
;
115 static const char *cleanup_arg
;
117 static enum commit_whence whence
;
118 static int sequencer_in_use
;
119 static int use_editor
= 1, include_status
= 1;
120 static int have_option_m
;
121 static struct strbuf message
= STRBUF_INIT
;
123 static enum wt_status_format status_format
= STATUS_FORMAT_UNSPECIFIED
;
125 static int opt_parse_porcelain(const struct option
*opt
, const char *arg
, int unset
)
127 enum wt_status_format
*value
= (enum wt_status_format
*)opt
->value
;
129 *value
= STATUS_FORMAT_NONE
;
131 *value
= STATUS_FORMAT_PORCELAIN
;
132 else if (!strcmp(arg
, "v1") || !strcmp(arg
, "1"))
133 *value
= STATUS_FORMAT_PORCELAIN
;
134 else if (!strcmp(arg
, "v2") || !strcmp(arg
, "2"))
135 *value
= STATUS_FORMAT_PORCELAIN_V2
;
137 die("unsupported porcelain version '%s'", arg
);
142 static int opt_parse_m(const struct option
*opt
, const char *arg
, int unset
)
144 struct strbuf
*buf
= opt
->value
;
147 strbuf_setlen(buf
, 0);
151 strbuf_addch(buf
, '\n');
152 strbuf_addstr(buf
, arg
);
153 strbuf_complete_line(buf
);
158 static void determine_whence(struct wt_status
*s
)
160 if (file_exists(git_path_merge_head()))
162 else if (file_exists(git_path_cherry_pick_head())) {
163 whence
= FROM_CHERRY_PICK
;
164 if (file_exists(git_path_seq_dir()))
165 sequencer_in_use
= 1;
168 whence
= FROM_COMMIT
;
173 static void status_init_config(struct wt_status
*s
, config_fn_t fn
)
175 wt_status_prepare(s
);
176 init_diff_ui_defaults();
179 s
->hints
= advice_status_hints
; /* must come after git_config() */
182 static void rollback_index_files(void)
184 switch (commit_style
) {
186 break; /* nothing to do */
188 rollback_lock_file(&index_lock
);
191 rollback_lock_file(&index_lock
);
192 rollback_lock_file(&false_lock
);
197 static int commit_index_files(void)
201 switch (commit_style
) {
203 break; /* nothing to do */
205 err
= commit_lock_file(&index_lock
);
208 err
= commit_lock_file(&index_lock
);
209 rollback_lock_file(&false_lock
);
217 * Take a union of paths in the index and the named tree (typically, "HEAD"),
218 * and return the paths that match the given pattern in list.
220 static int list_paths(struct string_list
*list
, const char *with_tree
,
221 const char *prefix
, const struct pathspec
*pattern
)
229 m
= xcalloc(1, pattern
->nr
);
232 char *max_prefix
= common_prefix(pattern
);
233 overlay_tree_on_index(&the_index
, with_tree
, max_prefix
);
237 for (i
= 0; i
< active_nr
; i
++) {
238 const struct cache_entry
*ce
= active_cache
[i
];
239 struct string_list_item
*item
;
241 if (ce
->ce_flags
& CE_UPDATE
)
243 if (!ce_path_match(ce
, pattern
, m
))
245 item
= string_list_insert(list
, ce
->name
);
246 if (ce_skip_worktree(ce
))
247 item
->util
= item
; /* better a valid pointer than a fake one */
250 ret
= report_path_error(m
, pattern
, prefix
);
255 static void add_remove_files(struct string_list
*list
)
258 for (i
= 0; i
< list
->nr
; i
++) {
260 struct string_list_item
*p
= &(list
->items
[i
]);
262 /* p->util is skip-worktree */
266 if (!lstat(p
->string
, &st
)) {
267 if (add_to_cache(p
->string
, &st
, 0))
268 die(_("updating files failed"));
270 remove_file_from_cache(p
->string
);
274 static void create_base_index(const struct commit
*current_head
)
277 struct unpack_trees_options opts
;
285 memset(&opts
, 0, sizeof(opts
));
289 opts
.src_index
= &the_index
;
290 opts
.dst_index
= &the_index
;
292 opts
.fn
= oneway_merge
;
293 tree
= parse_tree_indirect(¤t_head
->object
.oid
);
295 die(_("failed to unpack HEAD tree object"));
297 init_tree_desc(&t
, tree
->buffer
, tree
->size
);
298 if (unpack_trees(1, &t
, &opts
))
299 exit(128); /* We've already reported the error, finish dying */
302 static void refresh_cache_or_die(int refresh_flags
)
305 * refresh_flags contains REFRESH_QUIET, so the only errors
306 * are for unmerged entries.
308 if (refresh_cache(refresh_flags
| REFRESH_IN_PORCELAIN
))
309 die_resolve_conflict("commit");
312 static const char *prepare_index(int argc
, const char **argv
, const char *prefix
,
313 const struct commit
*current_head
, int is_status
)
315 struct string_list partial
= STRING_LIST_INIT_DUP
;
316 struct pathspec pathspec
;
317 int refresh_flags
= REFRESH_QUIET
;
321 refresh_flags
|= REFRESH_UNMERGED
;
322 parse_pathspec(&pathspec
, 0,
323 PATHSPEC_PREFER_FULL
,
326 if (read_cache_preload(&pathspec
) < 0)
327 die(_("index file corrupt"));
330 char *old_index_env
= NULL
;
331 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
333 refresh_cache_or_die(refresh_flags
);
335 if (write_locked_index(&the_index
, &index_lock
, 0))
336 die(_("unable to create temporary index"));
338 old_index_env
= getenv(INDEX_ENVIRONMENT
);
339 setenv(INDEX_ENVIRONMENT
, get_lock_file_path(&index_lock
), 1);
341 if (interactive_add(argc
, argv
, prefix
, patch_interactive
) != 0)
342 die(_("interactive add failed"));
344 if (old_index_env
&& *old_index_env
)
345 setenv(INDEX_ENVIRONMENT
, old_index_env
, 1);
347 unsetenv(INDEX_ENVIRONMENT
);
350 read_cache_from(get_lock_file_path(&index_lock
));
351 if (update_main_cache_tree(WRITE_TREE_SILENT
) == 0) {
352 if (reopen_lock_file(&index_lock
) < 0)
353 die(_("unable to write index file"));
354 if (write_locked_index(&the_index
, &index_lock
, 0))
355 die(_("unable to update temporary index"));
357 warning(_("Failed to update main cache tree"));
359 commit_style
= COMMIT_NORMAL
;
360 ret
= get_lock_file_path(&index_lock
);
365 * Non partial, non as-is commit.
367 * (1) get the real index;
368 * (2) update the_index as necessary;
369 * (3) write the_index out to the real index (still locked);
370 * (4) return the name of the locked index file.
372 * The caller should run hooks on the locked real index, and
373 * (A) if all goes well, commit the real index;
374 * (B) on failure, rollback the real index.
376 if (all
|| (also
&& pathspec
.nr
)) {
377 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
378 add_files_to_cache(also
? prefix
: NULL
, &pathspec
, 0);
379 refresh_cache_or_die(refresh_flags
);
380 update_main_cache_tree(WRITE_TREE_SILENT
);
381 if (write_locked_index(&the_index
, &index_lock
, 0))
382 die(_("unable to write new_index file"));
383 commit_style
= COMMIT_NORMAL
;
384 ret
= get_lock_file_path(&index_lock
);
391 * (1) return the name of the real index file.
393 * The caller should run hooks on the real index,
394 * and create commit from the_index.
395 * We still need to refresh the index here.
397 if (!only
&& !pathspec
.nr
) {
398 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
399 refresh_cache_or_die(refresh_flags
);
400 if (active_cache_changed
401 || !cache_tree_fully_valid(active_cache_tree
))
402 update_main_cache_tree(WRITE_TREE_SILENT
);
403 if (write_locked_index(&the_index
, &index_lock
,
404 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
405 die(_("unable to write new_index file"));
406 commit_style
= COMMIT_AS_IS
;
407 ret
= get_index_file();
414 * (0) find the set of affected paths;
415 * (1) get lock on the real index file;
416 * (2) update the_index with the given paths;
417 * (3) write the_index out to the real index (still locked);
418 * (4) get lock on the false index file;
419 * (5) reset the_index from HEAD;
420 * (6) update the_index the same way as (2);
421 * (7) write the_index out to the false index file;
422 * (8) return the name of the false index file (still locked);
424 * The caller should run hooks on the locked false index, and
425 * create commit from it. Then
426 * (A) if all goes well, commit the real index;
427 * (B) on failure, rollback the real index;
428 * In either case, rollback the false index.
430 commit_style
= COMMIT_PARTIAL
;
432 if (whence
!= FROM_COMMIT
) {
433 if (whence
== FROM_MERGE
)
434 die(_("cannot do a partial commit during a merge."));
435 else if (whence
== FROM_CHERRY_PICK
)
436 die(_("cannot do a partial commit during a cherry-pick."));
439 if (list_paths(&partial
, !current_head
? NULL
: "HEAD", prefix
, &pathspec
))
443 if (read_cache() < 0)
444 die(_("cannot read the index"));
446 hold_locked_index(&index_lock
, LOCK_DIE_ON_ERROR
);
447 add_remove_files(&partial
);
448 refresh_cache(REFRESH_QUIET
);
449 update_main_cache_tree(WRITE_TREE_SILENT
);
450 if (write_locked_index(&the_index
, &index_lock
, 0))
451 die(_("unable to write new_index file"));
453 hold_lock_file_for_update(&false_lock
,
454 git_path("next-index-%"PRIuMAX
,
455 (uintmax_t) getpid()),
458 create_base_index(current_head
);
459 add_remove_files(&partial
);
460 refresh_cache(REFRESH_QUIET
);
462 if (write_locked_index(&the_index
, &false_lock
, 0))
463 die(_("unable to write temporary index file"));
466 ret
= get_lock_file_path(&false_lock
);
467 read_cache_from(ret
);
469 string_list_clear(&partial
, 0);
470 clear_pathspec(&pathspec
);
474 static int run_status(FILE *fp
, const char *index_file
, const char *prefix
, int nowarn
,
477 struct object_id oid
;
479 if (s
->relative_paths
)
484 s
->reference
= "HEAD^1";
486 s
->verbose
= verbose
;
487 s
->index_file
= index_file
;
490 s
->is_initial
= get_oid(s
->reference
, &oid
) ? 1 : 0;
492 hashcpy(s
->sha1_commit
, oid
.hash
);
493 s
->status_format
= status_format
;
494 s
->ignore_submodule_arg
= ignore_submodule_arg
;
496 wt_status_collect(s
);
499 return s
->commitable
;
502 static int is_a_merge(const struct commit
*current_head
)
504 return !!(current_head
->parents
&& current_head
->parents
->next
);
507 static void assert_split_ident(struct ident_split
*id
, const struct strbuf
*buf
)
509 if (split_ident_line(id
, buf
->buf
, buf
->len
) || !id
->date_begin
)
510 die("BUG: unable to parse our own ident: %s", buf
->buf
);
513 static void export_one(const char *var
, const char *s
, const char *e
, int hack
)
515 struct strbuf buf
= STRBUF_INIT
;
517 strbuf_addch(&buf
, hack
);
518 strbuf_addf(&buf
, "%.*s", (int)(e
- s
), s
);
519 setenv(var
, buf
.buf
, 1);
520 strbuf_release(&buf
);
523 static int parse_force_date(const char *in
, struct strbuf
*out
)
525 strbuf_addch(out
, '@');
527 if (parse_date(in
, out
) < 0) {
529 unsigned long t
= approxidate_careful(in
, &errors
);
532 strbuf_addf(out
, "%lu", t
);
538 static void set_ident_var(char **buf
, char *val
)
544 static void determine_author_info(struct strbuf
*author_ident
)
546 char *name
, *email
, *date
;
547 struct ident_split author
;
549 name
= xstrdup_or_null(getenv("GIT_AUTHOR_NAME"));
550 email
= xstrdup_or_null(getenv("GIT_AUTHOR_EMAIL"));
551 date
= xstrdup_or_null(getenv("GIT_AUTHOR_DATE"));
553 if (author_message
) {
554 struct ident_split ident
;
558 a
= find_commit_header(author_message_buffer
, "author", &len
);
560 die(_("commit '%s' lacks author header"), author_message
);
561 if (split_ident_line(&ident
, a
, len
) < 0)
562 die(_("commit '%s' has malformed author line"), author_message
);
564 set_ident_var(&name
, xmemdupz(ident
.name_begin
, ident
.name_end
- ident
.name_begin
));
565 set_ident_var(&email
, xmemdupz(ident
.mail_begin
, ident
.mail_end
- ident
.mail_begin
));
567 if (ident
.date_begin
) {
568 struct strbuf date_buf
= STRBUF_INIT
;
569 strbuf_addch(&date_buf
, '@');
570 strbuf_add(&date_buf
, ident
.date_begin
, ident
.date_end
- ident
.date_begin
);
571 strbuf_addch(&date_buf
, ' ');
572 strbuf_add(&date_buf
, ident
.tz_begin
, ident
.tz_end
- ident
.tz_begin
);
573 set_ident_var(&date
, strbuf_detach(&date_buf
, NULL
));
578 struct ident_split ident
;
580 if (split_ident_line(&ident
, force_author
, strlen(force_author
)) < 0)
581 die(_("malformed --author parameter"));
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
));
587 struct strbuf date_buf
= STRBUF_INIT
;
588 if (parse_force_date(force_date
, &date_buf
))
589 die(_("invalid date format: %s"), force_date
);
590 set_ident_var(&date
, strbuf_detach(&date_buf
, NULL
));
593 strbuf_addstr(author_ident
, fmt_ident(name
, email
, date
, IDENT_STRICT
));
594 assert_split_ident(&author
, author_ident
);
595 export_one("GIT_AUTHOR_NAME", author
.name_begin
, author
.name_end
, 0);
596 export_one("GIT_AUTHOR_EMAIL", author
.mail_begin
, author
.mail_end
, 0);
597 export_one("GIT_AUTHOR_DATE", author
.date_begin
, author
.tz_end
, '@');
603 static int author_date_is_interesting(void)
605 return author_message
|| force_date
;
608 static void adjust_comment_line_char(const struct strbuf
*sb
)
610 char candidates
[] = "#;@!$%^&|:";
614 comment_line_char
= candidates
[0];
615 if (!memchr(sb
->buf
, comment_line_char
, sb
->len
))
619 candidate
= strchr(candidates
, *p
);
622 for (p
= sb
->buf
; *p
; p
++) {
623 if ((p
[0] == '\n' || p
[0] == '\r') && p
[1]) {
624 candidate
= strchr(candidates
, p
[1]);
630 for (p
= candidates
; *p
== ' '; p
++)
633 die(_("unable to select a comment character that is not used\n"
634 "in the current commit message"));
635 comment_line_char
= *p
;
638 static int prepare_to_commit(const char *index_file
, const char *prefix
,
639 struct commit
*current_head
,
641 struct strbuf
*author_ident
)
644 struct strbuf committer_ident
= STRBUF_INIT
;
646 struct strbuf sb
= STRBUF_INIT
;
647 const char *hook_arg1
= NULL
;
648 const char *hook_arg2
= NULL
;
649 int clean_message_contents
= (cleanup_mode
!= COMMIT_MSG_CLEANUP_NONE
);
650 int old_display_comment_prefix
;
652 /* This checks and barfs if author is badly specified */
653 determine_author_info(author_ident
);
655 if (!no_verify
&& run_commit_hook(use_editor
, index_file
, "pre-commit", NULL
))
658 if (squash_message
) {
660 * Insert the proper subject line before other commit
661 * message options add their content.
663 if (use_message
&& !strcmp(use_message
, squash_message
))
664 strbuf_addstr(&sb
, "squash! ");
666 struct pretty_print_context ctx
= {0};
668 c
= lookup_commit_reference_by_name(squash_message
);
670 die(_("could not lookup commit %s"), squash_message
);
671 ctx
.output_encoding
= get_commit_output_encoding();
672 format_commit_message(c
, "squash! %s\n\n", &sb
,
677 if (have_option_m
&& !fixup_message
) {
678 strbuf_addbuf(&sb
, &message
);
679 hook_arg1
= "message";
680 } else if (logfile
&& !strcmp(logfile
, "-")) {
682 fprintf(stderr
, _("(reading log message from standard input)\n"));
683 if (strbuf_read(&sb
, 0, 0) < 0)
684 die_errno(_("could not read log from standard input"));
685 hook_arg1
= "message";
686 } else if (logfile
) {
687 if (strbuf_read_file(&sb
, logfile
, 0) < 0)
688 die_errno(_("could not read log file '%s'"),
690 hook_arg1
= "message";
691 } else if (use_message
) {
693 buffer
= strstr(use_message_buffer
, "\n\n");
695 strbuf_addstr(&sb
, skip_blank_lines(buffer
+ 2));
696 hook_arg1
= "commit";
697 hook_arg2
= use_message
;
698 } else if (fixup_message
) {
699 struct pretty_print_context ctx
= {0};
700 struct commit
*commit
;
701 commit
= lookup_commit_reference_by_name(fixup_message
);
703 die(_("could not lookup commit %s"), fixup_message
);
704 ctx
.output_encoding
= get_commit_output_encoding();
705 format_commit_message(commit
, "fixup! %s\n\n",
708 strbuf_addbuf(&sb
, &message
);
709 hook_arg1
= "message";
710 } else if (!stat(git_path_merge_msg(), &statbuf
)) {
712 * prepend SQUASH_MSG here if it exists and a
713 * "merge --squash" was originally performed
715 if (!stat(git_path_squash_msg(), &statbuf
)) {
716 if (strbuf_read_file(&sb
, git_path_squash_msg(), 0) < 0)
717 die_errno(_("could not read SQUASH_MSG"));
718 hook_arg1
= "squash";
721 if (strbuf_read_file(&sb
, git_path_merge_msg(), 0) < 0)
722 die_errno(_("could not read MERGE_MSG"));
723 } else if (!stat(git_path_squash_msg(), &statbuf
)) {
724 if (strbuf_read_file(&sb
, git_path_squash_msg(), 0) < 0)
725 die_errno(_("could not read SQUASH_MSG"));
726 hook_arg1
= "squash";
727 } else if (template_file
) {
728 if (strbuf_read_file(&sb
, template_file
, 0) < 0)
729 die_errno(_("could not read '%s'"), template_file
);
730 hook_arg1
= "template";
731 clean_message_contents
= 0;
735 * The remaining cases don't modify the template message, but
736 * just set the argument(s) to the prepare-commit-msg hook.
738 else if (whence
== FROM_MERGE
)
740 else if (whence
== FROM_CHERRY_PICK
) {
741 hook_arg1
= "commit";
742 hook_arg2
= "CHERRY_PICK_HEAD";
745 if (squash_message
) {
747 * If squash_commit was used for the commit subject,
748 * then we're possibly hijacking other commit log options.
749 * Reset the hook args to tell the real story.
751 hook_arg1
= "message";
755 s
->fp
= fopen_for_writing(git_path_commit_editmsg());
757 die_errno(_("could not open '%s'"), git_path_commit_editmsg());
759 /* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
760 old_display_comment_prefix
= s
->display_comment_prefix
;
761 s
->display_comment_prefix
= 1;
764 * Most hints are counter-productive when the commit has
769 if (clean_message_contents
)
770 strbuf_stripspace(&sb
, 0);
773 append_signoff(&sb
, ignore_non_trailer(sb
.buf
, sb
.len
), 0);
775 if (fwrite(sb
.buf
, 1, sb
.len
, s
->fp
) < sb
.len
)
776 die_errno(_("could not write commit template"));
778 if (auto_comment_line_char
)
779 adjust_comment_line_char(&sb
);
782 /* This checks if committer ident is explicitly given */
783 strbuf_addstr(&committer_ident
, git_committer_info(IDENT_STRICT
));
784 if (use_editor
&& include_status
) {
786 int saved_color_setting
;
787 struct ident_split ci
, ai
;
789 if (whence
!= FROM_COMMIT
) {
790 if (cleanup_mode
== COMMIT_MSG_CLEANUP_SCISSORS
)
791 wt_status_add_cut_line(s
->fp
);
792 status_printf_ln(s
, GIT_COLOR_NORMAL
,
795 "It looks like you may be committing a merge.\n"
796 "If this is not correct, please remove the file\n"
800 "It looks like you may be committing a cherry-pick.\n"
801 "If this is not correct, please remove the file\n"
804 whence
== FROM_MERGE
?
805 git_path_merge_head() :
806 git_path_cherry_pick_head());
809 fprintf(s
->fp
, "\n");
810 if (cleanup_mode
== COMMIT_MSG_CLEANUP_ALL
)
811 status_printf(s
, GIT_COLOR_NORMAL
,
812 _("Please enter the commit message for your changes."
813 " Lines starting\nwith '%c' will be ignored, and an empty"
814 " message aborts the commit.\n"), comment_line_char
);
815 else if (cleanup_mode
== COMMIT_MSG_CLEANUP_SCISSORS
&&
816 whence
== FROM_COMMIT
)
817 wt_status_add_cut_line(s
->fp
);
818 else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
819 status_printf(s
, GIT_COLOR_NORMAL
,
820 _("Please enter the commit message for your changes."
822 "with '%c' will be kept; you may remove them"
823 " yourself if you want to.\n"
824 "An empty message aborts the commit.\n"), comment_line_char
);
827 * These should never fail because they come from our own
828 * fmt_ident. They may fail the sane_ident test, but we know
829 * that the name and mail pointers will at least be valid,
830 * which is enough for our tests and printing here.
832 assert_split_ident(&ai
, author_ident
);
833 assert_split_ident(&ci
, &committer_ident
);
835 if (ident_cmp(&ai
, &ci
))
836 status_printf_ln(s
, GIT_COLOR_NORMAL
,
838 "Author: %.*s <%.*s>"),
839 ident_shown
++ ? "" : "\n",
840 (int)(ai
.name_end
- ai
.name_begin
), ai
.name_begin
,
841 (int)(ai
.mail_end
- ai
.mail_begin
), ai
.mail_begin
);
843 if (author_date_is_interesting())
844 status_printf_ln(s
, GIT_COLOR_NORMAL
,
847 ident_shown
++ ? "" : "\n",
848 show_ident_date(&ai
, DATE_MODE(NORMAL
)));
850 if (!committer_ident_sufficiently_given())
851 status_printf_ln(s
, GIT_COLOR_NORMAL
,
853 "Committer: %.*s <%.*s>"),
854 ident_shown
++ ? "" : "\n",
855 (int)(ci
.name_end
- ci
.name_begin
), ci
.name_begin
,
856 (int)(ci
.mail_end
- ci
.mail_begin
), ci
.mail_begin
);
858 status_printf_ln(s
, GIT_COLOR_NORMAL
, "%s", ""); /* Add new line for clarity */
860 saved_color_setting
= s
->use_color
;
862 commitable
= run_status(s
->fp
, index_file
, prefix
, 1, s
);
863 s
->use_color
= saved_color_setting
;
865 struct object_id oid
;
866 const char *parent
= "HEAD";
868 if (!active_nr
&& read_cache() < 0)
869 die(_("Cannot read index"));
874 if (get_oid(parent
, &oid
)) {
877 for (i
= 0; i
< active_nr
; i
++)
878 if (ce_intent_to_add(active_cache
[i
]))
880 commitable
= active_nr
- ita_nr
> 0;
883 * Unless the user did explicitly request a submodule
884 * ignore mode by passing a command line option we do
885 * not ignore any changed submodule SHA-1s when
886 * comparing index and parent, no matter what is
887 * configured. Otherwise we won't commit any
888 * submodules which were manually staged, which would
889 * be really confusing.
891 struct diff_flags flags
= DIFF_FLAGS_INIT
;
892 flags
.override_submodule_config
= 1;
893 if (ignore_submodule_arg
&&
894 !strcmp(ignore_submodule_arg
, "all"))
895 flags
.ignore_submodules
= 1;
896 commitable
= index_differs_from(parent
, &flags
, 1);
899 strbuf_release(&committer_ident
);
904 * Reject an attempt to record a non-merge empty commit without
905 * explicit --allow-empty. In the cherry-pick case, it may be
906 * empty due to conflict resolution, which the user should okay.
908 if (!commitable
&& whence
!= FROM_MERGE
&& !allow_empty
&&
909 !(amend
&& is_a_merge(current_head
))) {
910 s
->display_comment_prefix
= old_display_comment_prefix
;
911 run_status(stdout
, index_file
, prefix
, 0, s
);
913 fputs(_(empty_amend_advice
), stderr
);
914 else if (whence
== FROM_CHERRY_PICK
) {
915 fputs(_(empty_cherry_pick_advice
), stderr
);
916 if (!sequencer_in_use
)
917 fputs(_(empty_cherry_pick_advice_single
), stderr
);
919 fputs(_(empty_cherry_pick_advice_multi
), stderr
);
924 if (!no_verify
&& find_hook("pre-commit")) {
926 * Re-read the index as pre-commit hook could have updated it,
927 * and write it out as a tree. We must do this before we invoke
928 * the editor and after we invoke run_status above.
932 read_cache_from(index_file
);
934 if (update_main_cache_tree(0)) {
935 error(_("Error building trees"));
939 if (run_commit_hook(use_editor
, index_file
, "prepare-commit-msg",
940 git_path_commit_editmsg(), hook_arg1
, hook_arg2
, NULL
))
944 struct argv_array env
= ARGV_ARRAY_INIT
;
946 argv_array_pushf(&env
, "GIT_INDEX_FILE=%s", index_file
);
947 if (launch_editor(git_path_commit_editmsg(), NULL
, env
.argv
)) {
949 _("Please supply the message using either -m or -F option.\n"));
952 argv_array_clear(&env
);
956 run_commit_hook(use_editor
, index_file
, "commit-msg", git_path_commit_editmsg(), NULL
)) {
963 static const char *find_author_by_nickname(const char *name
)
965 struct rev_info revs
;
966 struct commit
*commit
;
967 struct strbuf buf
= STRBUF_INIT
;
968 struct string_list mailmap
= STRING_LIST_INIT_NODUP
;
972 init_revisions(&revs
, NULL
);
973 strbuf_addf(&buf
, "--author=%s", name
);
978 setup_revisions(ac
, av
, &revs
, NULL
);
979 revs
.mailmap
= &mailmap
;
980 read_mailmap(revs
.mailmap
, NULL
);
982 if (prepare_revision_walk(&revs
))
983 die(_("revision walk setup failed"));
984 commit
= get_revision(&revs
);
986 struct pretty_print_context ctx
= {0};
987 ctx
.date_mode
.type
= DATE_NORMAL
;
988 strbuf_release(&buf
);
989 format_commit_message(commit
, "%aN <%aE>", &buf
, &ctx
);
990 clear_mailmap(&mailmap
);
991 return strbuf_detach(&buf
, NULL
);
993 die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name
);
996 static void handle_ignored_arg(struct wt_status
*s
)
999 ; /* default already initialized */
1000 else if (!strcmp(ignored_arg
, "traditional"))
1001 s
->show_ignored_mode
= SHOW_TRADITIONAL_IGNORED
;
1002 else if (!strcmp(ignored_arg
, "no"))
1003 s
->show_ignored_mode
= SHOW_NO_IGNORED
;
1004 else if (!strcmp(ignored_arg
, "matching"))
1005 s
->show_ignored_mode
= SHOW_MATCHING_IGNORED
;
1007 die(_("Invalid ignored mode '%s'"), ignored_arg
);
1010 static void handle_untracked_files_arg(struct wt_status
*s
)
1012 if (!untracked_files_arg
)
1013 ; /* default already initialized */
1014 else if (!strcmp(untracked_files_arg
, "no"))
1015 s
->show_untracked_files
= SHOW_NO_UNTRACKED_FILES
;
1016 else if (!strcmp(untracked_files_arg
, "normal"))
1017 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
1018 else if (!strcmp(untracked_files_arg
, "all"))
1019 s
->show_untracked_files
= SHOW_ALL_UNTRACKED_FILES
;
1021 die(_("Invalid untracked files mode '%s'"), untracked_files_arg
);
1024 static const char *read_commit_message(const char *name
)
1026 const char *out_enc
;
1027 struct commit
*commit
;
1029 commit
= lookup_commit_reference_by_name(name
);
1031 die(_("could not lookup commit %s"), name
);
1032 out_enc
= get_commit_output_encoding();
1033 return logmsg_reencode(commit
, NULL
, out_enc
);
1037 * Enumerate what needs to be propagated when --porcelain
1038 * is not in effect here.
1040 static struct status_deferred_config
{
1041 enum wt_status_format status_format
;
1043 } status_deferred_config
= {
1044 STATUS_FORMAT_UNSPECIFIED
,
1045 -1 /* unspecified */
1048 static void finalize_deferred_config(struct wt_status
*s
)
1050 int use_deferred_config
= (status_format
!= STATUS_FORMAT_PORCELAIN
&&
1051 status_format
!= STATUS_FORMAT_PORCELAIN_V2
&&
1052 !s
->null_termination
);
1054 if (s
->null_termination
) {
1055 if (status_format
== STATUS_FORMAT_NONE
||
1056 status_format
== STATUS_FORMAT_UNSPECIFIED
)
1057 status_format
= STATUS_FORMAT_PORCELAIN
;
1058 else if (status_format
== STATUS_FORMAT_LONG
)
1059 die(_("--long and -z are incompatible"));
1062 if (use_deferred_config
&& status_format
== STATUS_FORMAT_UNSPECIFIED
)
1063 status_format
= status_deferred_config
.status_format
;
1064 if (status_format
== STATUS_FORMAT_UNSPECIFIED
)
1065 status_format
= STATUS_FORMAT_NONE
;
1067 if (use_deferred_config
&& s
->show_branch
< 0)
1068 s
->show_branch
= status_deferred_config
.show_branch
;
1069 if (s
->show_branch
< 0)
1072 if (s
->ahead_behind_flags
== AHEAD_BEHIND_UNSPECIFIED
)
1073 s
->ahead_behind_flags
= AHEAD_BEHIND_FULL
;
1076 static int parse_and_validate_options(int argc
, const char *argv
[],
1077 const struct option
*options
,
1078 const char * const usage
[],
1080 struct commit
*current_head
,
1081 struct wt_status
*s
)
1085 argc
= parse_options(argc
, argv
, prefix
, options
, usage
, 0);
1086 finalize_deferred_config(s
);
1088 if (force_author
&& !strchr(force_author
, '>'))
1089 force_author
= find_author_by_nickname(force_author
);
1091 if (force_author
&& renew_authorship
)
1092 die(_("Using both --reset-author and --author does not make sense"));
1094 if (logfile
|| have_option_m
|| use_message
|| fixup_message
)
1097 use_editor
= edit_flag
;
1099 /* Sanity check options */
1100 if (amend
&& !current_head
)
1101 die(_("You have nothing to amend."));
1102 if (amend
&& whence
!= FROM_COMMIT
) {
1103 if (whence
== FROM_MERGE
)
1104 die(_("You are in the middle of a merge -- cannot amend."));
1105 else if (whence
== FROM_CHERRY_PICK
)
1106 die(_("You are in the middle of a cherry-pick -- cannot amend."));
1108 if (fixup_message
&& squash_message
)
1109 die(_("Options --squash and --fixup cannot be used together"));
1119 die(_("Only one of -c/-C/-F/--fixup can be used."));
1120 if (have_option_m
&& (edit_message
|| use_message
|| logfile
))
1121 die((_("Option -m cannot be combined with -c/-C/-F.")));
1122 if (f
|| have_option_m
)
1123 template_file
= NULL
;
1125 use_message
= edit_message
;
1126 if (amend
&& !use_message
&& !fixup_message
)
1127 use_message
= "HEAD";
1128 if (!use_message
&& whence
!= FROM_CHERRY_PICK
&& renew_authorship
)
1129 die(_("--reset-author can be used only with -C, -c or --amend."));
1131 use_message_buffer
= read_commit_message(use_message
);
1132 if (!renew_authorship
) {
1133 author_message
= use_message
;
1134 author_message_buffer
= use_message_buffer
;
1137 if (whence
== FROM_CHERRY_PICK
&& !renew_authorship
) {
1138 author_message
= "CHERRY_PICK_HEAD";
1139 author_message_buffer
= read_commit_message(author_message
);
1142 if (patch_interactive
)
1145 if (also
+ only
+ all
+ interactive
> 1)
1146 die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
1147 if (argc
== 0 && (also
|| (only
&& !amend
&& !allow_empty
)))
1148 die(_("No paths with --include/--only does not make sense."));
1149 if (!cleanup_arg
|| !strcmp(cleanup_arg
, "default"))
1150 cleanup_mode
= use_editor
? COMMIT_MSG_CLEANUP_ALL
:
1151 COMMIT_MSG_CLEANUP_SPACE
;
1152 else if (!strcmp(cleanup_arg
, "verbatim"))
1153 cleanup_mode
= COMMIT_MSG_CLEANUP_NONE
;
1154 else if (!strcmp(cleanup_arg
, "whitespace"))
1155 cleanup_mode
= COMMIT_MSG_CLEANUP_SPACE
;
1156 else if (!strcmp(cleanup_arg
, "strip"))
1157 cleanup_mode
= COMMIT_MSG_CLEANUP_ALL
;
1158 else if (!strcmp(cleanup_arg
, "scissors"))
1159 cleanup_mode
= use_editor
? COMMIT_MSG_CLEANUP_SCISSORS
:
1160 COMMIT_MSG_CLEANUP_SPACE
;
1162 die(_("Invalid cleanup mode %s"), cleanup_arg
);
1164 handle_untracked_files_arg(s
);
1166 if (all
&& argc
> 0)
1167 die(_("Paths with -a does not make sense."));
1169 if (status_format
!= STATUS_FORMAT_NONE
)
1175 static int dry_run_commit(int argc
, const char **argv
, const char *prefix
,
1176 const struct commit
*current_head
, struct wt_status
*s
)
1179 const char *index_file
;
1181 index_file
= prepare_index(argc
, argv
, prefix
, current_head
, 1);
1182 commitable
= run_status(stdout
, index_file
, prefix
, 0, s
);
1183 rollback_index_files();
1185 return commitable
? 0 : 1;
1188 static int parse_status_slot(const char *slot
)
1190 if (!strcasecmp(slot
, "added"))
1191 return WT_STATUS_UPDATED
;
1193 return LOOKUP_CONFIG(color_status_slots
, slot
);
1196 static int git_status_config(const char *k
, const char *v
, void *cb
)
1198 struct wt_status
*s
= cb
;
1199 const char *slot_name
;
1201 if (starts_with(k
, "column."))
1202 return git_column_config(k
, v
, "status", &s
->colopts
);
1203 if (!strcmp(k
, "status.submodulesummary")) {
1205 s
->submodule_summary
= git_config_bool_or_int(k
, v
, &is_bool
);
1206 if (is_bool
&& s
->submodule_summary
)
1207 s
->submodule_summary
= -1;
1210 if (!strcmp(k
, "status.short")) {
1211 if (git_config_bool(k
, v
))
1212 status_deferred_config
.status_format
= STATUS_FORMAT_SHORT
;
1214 status_deferred_config
.status_format
= STATUS_FORMAT_NONE
;
1217 if (!strcmp(k
, "status.branch")) {
1218 status_deferred_config
.show_branch
= git_config_bool(k
, v
);
1221 if (!strcmp(k
, "status.showstash")) {
1222 s
->show_stash
= git_config_bool(k
, v
);
1225 if (!strcmp(k
, "status.color") || !strcmp(k
, "color.status")) {
1226 s
->use_color
= git_config_colorbool(k
, v
);
1229 if (!strcmp(k
, "status.displaycommentprefix")) {
1230 s
->display_comment_prefix
= git_config_bool(k
, v
);
1233 if (skip_prefix(k
, "status.color.", &slot_name
) ||
1234 skip_prefix(k
, "color.status.", &slot_name
)) {
1235 int slot
= parse_status_slot(slot_name
);
1239 return config_error_nonbool(k
);
1240 return color_parse(v
, s
->color_palette
[slot
]);
1242 if (!strcmp(k
, "status.relativepaths")) {
1243 s
->relative_paths
= git_config_bool(k
, v
);
1246 if (!strcmp(k
, "status.showuntrackedfiles")) {
1248 return config_error_nonbool(k
);
1249 else if (!strcmp(v
, "no"))
1250 s
->show_untracked_files
= SHOW_NO_UNTRACKED_FILES
;
1251 else if (!strcmp(v
, "normal"))
1252 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
1253 else if (!strcmp(v
, "all"))
1254 s
->show_untracked_files
= SHOW_ALL_UNTRACKED_FILES
;
1256 return error(_("Invalid untracked files mode '%s'"), v
);
1259 return git_diff_ui_config(k
, v
, NULL
);
1262 int cmd_status(int argc
, const char **argv
, const char *prefix
)
1264 static struct wt_status s
;
1266 struct object_id oid
;
1267 static struct option builtin_status_options
[] = {
1268 OPT__VERBOSE(&verbose
, N_("be verbose")),
1269 OPT_SET_INT('s', "short", &status_format
,
1270 N_("show status concisely"), STATUS_FORMAT_SHORT
),
1271 OPT_BOOL('b', "branch", &s
.show_branch
,
1272 N_("show branch information")),
1273 OPT_BOOL(0, "show-stash", &s
.show_stash
,
1274 N_("show stash information")),
1275 OPT_BOOL(0, "ahead-behind", &s
.ahead_behind_flags
,
1276 N_("compute full ahead/behind values")),
1277 { OPTION_CALLBACK
, 0, "porcelain", &status_format
,
1278 N_("version"), N_("machine-readable output"),
1279 PARSE_OPT_OPTARG
, opt_parse_porcelain
},
1280 OPT_SET_INT(0, "long", &status_format
,
1281 N_("show status in long format (default)"),
1282 STATUS_FORMAT_LONG
),
1283 OPT_BOOL('z', "null", &s
.null_termination
,
1284 N_("terminate entries with NUL")),
1285 { OPTION_STRING
, 'u', "untracked-files", &untracked_files_arg
,
1287 N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
1288 PARSE_OPT_OPTARG
, NULL
, (intptr_t)"all" },
1289 { OPTION_STRING
, 0, "ignored", &ignored_arg
,
1291 N_("show ignored files, optional modes: traditional, matching, no. (Default: traditional)"),
1292 PARSE_OPT_OPTARG
, NULL
, (intptr_t)"traditional" },
1293 { OPTION_STRING
, 0, "ignore-submodules", &ignore_submodule_arg
, N_("when"),
1294 N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
1295 PARSE_OPT_OPTARG
, NULL
, (intptr_t)"all" },
1296 OPT_COLUMN(0, "column", &s
.colopts
, N_("list untracked files in columns")),
1300 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1301 usage_with_options(builtin_status_usage
, builtin_status_options
);
1303 status_init_config(&s
, git_status_config
);
1304 argc
= parse_options(argc
, argv
, prefix
,
1305 builtin_status_options
,
1306 builtin_status_usage
, 0);
1307 finalize_colopts(&s
.colopts
, -1);
1308 finalize_deferred_config(&s
);
1310 handle_untracked_files_arg(&s
);
1311 handle_ignored_arg(&s
);
1313 if (s
.show_ignored_mode
== SHOW_MATCHING_IGNORED
&&
1314 s
.show_untracked_files
== SHOW_NO_UNTRACKED_FILES
)
1315 die(_("Unsupported combination of ignored and untracked-files arguments"));
1317 parse_pathspec(&s
.pathspec
, 0,
1318 PATHSPEC_PREFER_FULL
,
1321 read_cache_preload(&s
.pathspec
);
1322 refresh_index(&the_index
, REFRESH_QUIET
|REFRESH_UNMERGED
, &s
.pathspec
, NULL
, NULL
);
1324 if (use_optional_locks())
1325 fd
= hold_locked_index(&index_lock
, 0);
1329 s
.is_initial
= get_oid(s
.reference
, &oid
) ? 1 : 0;
1331 hashcpy(s
.sha1_commit
, oid
.hash
);
1333 s
.ignore_submodule_arg
= ignore_submodule_arg
;
1334 s
.status_format
= status_format
;
1335 s
.verbose
= verbose
;
1337 wt_status_collect(&s
);
1340 update_index_if_able(&the_index
, &index_lock
);
1342 if (s
.relative_paths
)
1345 wt_status_print(&s
);
1349 static int git_commit_config(const char *k
, const char *v
, void *cb
)
1351 struct wt_status
*s
= cb
;
1354 if (!strcmp(k
, "commit.template"))
1355 return git_config_pathname(&template_file
, k
, v
);
1356 if (!strcmp(k
, "commit.status")) {
1357 include_status
= git_config_bool(k
, v
);
1360 if (!strcmp(k
, "commit.cleanup"))
1361 return git_config_string(&cleanup_arg
, k
, v
);
1362 if (!strcmp(k
, "commit.gpgsign")) {
1363 sign_commit
= git_config_bool(k
, v
) ? "" : NULL
;
1366 if (!strcmp(k
, "commit.verbose")) {
1368 config_commit_verbose
= git_config_bool_or_int(k
, v
, &is_bool
);
1372 status
= git_gpg_config(k
, v
, NULL
);
1375 return git_status_config(k
, v
, s
);
1378 int run_commit_hook(int editor_is_used
, const char *index_file
, const char *name
, ...)
1380 struct argv_array hook_env
= ARGV_ARRAY_INIT
;
1384 argv_array_pushf(&hook_env
, "GIT_INDEX_FILE=%s", index_file
);
1387 * Let the hook know that no editor will be launched.
1389 if (!editor_is_used
)
1390 argv_array_push(&hook_env
, "GIT_EDITOR=:");
1392 va_start(args
, name
);
1393 ret
= run_hook_ve(hook_env
.argv
,name
, args
);
1395 argv_array_clear(&hook_env
);
1400 int cmd_commit(int argc
, const char **argv
, const char *prefix
)
1402 const char *argv_gc_auto
[] = {"gc", "--auto", NULL
};
1403 static struct wt_status s
;
1404 static struct option builtin_commit_options
[] = {
1405 OPT__QUIET(&quiet
, N_("suppress summary after successful commit")),
1406 OPT__VERBOSE(&verbose
, N_("show diff in commit message template")),
1408 OPT_GROUP(N_("Commit message options")),
1409 OPT_FILENAME('F', "file", &logfile
, N_("read message from file")),
1410 OPT_STRING(0, "author", &force_author
, N_("author"), N_("override author for commit")),
1411 OPT_STRING(0, "date", &force_date
, N_("date"), N_("override date for commit")),
1412 OPT_CALLBACK('m', "message", &message
, N_("message"), N_("commit message"), opt_parse_m
),
1413 OPT_STRING('c', "reedit-message", &edit_message
, N_("commit"), N_("reuse and edit message from specified commit")),
1414 OPT_STRING('C', "reuse-message", &use_message
, N_("commit"), N_("reuse message from specified commit")),
1415 OPT_STRING(0, "fixup", &fixup_message
, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
1416 OPT_STRING(0, "squash", &squash_message
, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
1417 OPT_BOOL(0, "reset-author", &renew_authorship
, N_("the commit is authored by me now (used with -C/-c/--amend)")),
1418 OPT_BOOL('s', "signoff", &signoff
, N_("add Signed-off-by:")),
1419 OPT_FILENAME('t', "template", &template_file
, N_("use specified template file")),
1420 OPT_BOOL('e', "edit", &edit_flag
, N_("force edit of commit")),
1421 OPT_STRING(0, "cleanup", &cleanup_arg
, N_("default"), N_("how to strip spaces and #comments from message")),
1422 OPT_BOOL(0, "status", &include_status
, N_("include status in commit message template")),
1423 { OPTION_STRING
, 'S', "gpg-sign", &sign_commit
, N_("key-id"),
1424 N_("GPG sign commit"), PARSE_OPT_OPTARG
, NULL
, (intptr_t) "" },
1425 /* end commit message options */
1427 OPT_GROUP(N_("Commit contents options")),
1428 OPT_BOOL('a', "all", &all
, N_("commit all changed files")),
1429 OPT_BOOL('i', "include", &also
, N_("add specified files to index for commit")),
1430 OPT_BOOL(0, "interactive", &interactive
, N_("interactively add files")),
1431 OPT_BOOL('p', "patch", &patch_interactive
, N_("interactively add changes")),
1432 OPT_BOOL('o', "only", &only
, N_("commit only specified files")),
1433 OPT_BOOL('n', "no-verify", &no_verify
, N_("bypass pre-commit and commit-msg hooks")),
1434 OPT_BOOL(0, "dry-run", &dry_run
, N_("show what would be committed")),
1435 OPT_SET_INT(0, "short", &status_format
, N_("show status concisely"),
1436 STATUS_FORMAT_SHORT
),
1437 OPT_BOOL(0, "branch", &s
.show_branch
, N_("show branch information")),
1438 OPT_BOOL(0, "ahead-behind", &s
.ahead_behind_flags
,
1439 N_("compute full ahead/behind values")),
1440 OPT_SET_INT(0, "porcelain", &status_format
,
1441 N_("machine-readable output"), STATUS_FORMAT_PORCELAIN
),
1442 OPT_SET_INT(0, "long", &status_format
,
1443 N_("show status in long format (default)"),
1444 STATUS_FORMAT_LONG
),
1445 OPT_BOOL('z', "null", &s
.null_termination
,
1446 N_("terminate entries with NUL")),
1447 OPT_BOOL(0, "amend", &amend
, N_("amend previous commit")),
1448 OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite
, N_("bypass post-rewrite hook")),
1449 { 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" },
1450 /* end commit contents options */
1452 OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty
,
1453 N_("ok to record an empty change")),
1454 OPT_HIDDEN_BOOL(0, "allow-empty-message", &allow_empty_message
,
1455 N_("ok to record a change with an empty message")),
1460 struct strbuf sb
= STRBUF_INIT
;
1461 struct strbuf author_ident
= STRBUF_INIT
;
1462 const char *index_file
, *reflog_msg
;
1463 struct object_id oid
;
1464 struct commit_list
*parents
= NULL
;
1465 struct stat statbuf
;
1466 struct commit
*current_head
= NULL
;
1467 struct commit_extra_header
*extra
= NULL
;
1468 struct strbuf err
= STRBUF_INIT
;
1470 if (argc
== 2 && !strcmp(argv
[1], "-h"))
1471 usage_with_options(builtin_commit_usage
, builtin_commit_options
);
1473 status_init_config(&s
, git_commit_config
);
1474 s
.commit_template
= 1;
1475 status_format
= STATUS_FORMAT_NONE
; /* Ignore status.short */
1478 if (get_oid("HEAD", &oid
))
1479 current_head
= NULL
;
1481 current_head
= lookup_commit_or_die(&oid
, "HEAD");
1482 if (parse_commit(current_head
))
1483 die(_("could not parse HEAD commit"));
1485 verbose
= -1; /* unspecified */
1486 argc
= parse_and_validate_options(argc
, argv
, builtin_commit_options
,
1487 builtin_commit_usage
,
1488 prefix
, current_head
, &s
);
1490 verbose
= (config_commit_verbose
< 0) ? 0 : config_commit_verbose
;
1493 return dry_run_commit(argc
, argv
, prefix
, current_head
, &s
);
1494 index_file
= prepare_index(argc
, argv
, prefix
, current_head
, 0);
1496 /* Set up everything for writing the commit object. This includes
1497 running hooks, writing the trees, and interacting with the user. */
1498 if (!prepare_to_commit(index_file
, prefix
,
1499 current_head
, &s
, &author_ident
)) {
1500 rollback_index_files();
1504 /* Determine parents */
1505 reflog_msg
= getenv("GIT_REFLOG_ACTION");
1506 if (!current_head
) {
1508 reflog_msg
= "commit (initial)";
1511 reflog_msg
= "commit (amend)";
1512 parents
= copy_commit_list(current_head
->parents
);
1513 } else if (whence
== FROM_MERGE
) {
1514 struct strbuf m
= STRBUF_INIT
;
1516 int allow_fast_forward
= 1;
1517 struct commit_list
**pptr
= &parents
;
1520 reflog_msg
= "commit (merge)";
1521 pptr
= commit_list_append(current_head
, pptr
);
1522 fp
= xfopen(git_path_merge_head(), "r");
1523 while (strbuf_getline_lf(&m
, fp
) != EOF
) {
1524 struct commit
*parent
;
1526 parent
= get_merge_parent(m
.buf
);
1528 die(_("Corrupt MERGE_HEAD file (%s)"), m
.buf
);
1529 pptr
= commit_list_append(parent
, pptr
);
1533 if (!stat(git_path_merge_mode(), &statbuf
)) {
1534 if (strbuf_read_file(&sb
, git_path_merge_mode(), 0) < 0)
1535 die_errno(_("could not read MERGE_MODE"));
1536 if (!strcmp(sb
.buf
, "no-ff"))
1537 allow_fast_forward
= 0;
1539 if (allow_fast_forward
)
1540 reduce_heads_replace(&parents
);
1543 reflog_msg
= (whence
== FROM_CHERRY_PICK
)
1544 ? "commit (cherry-pick)"
1546 commit_list_insert(current_head
, &parents
);
1549 /* Finally, get the commit message */
1551 if (strbuf_read_file(&sb
, git_path_commit_editmsg(), 0) < 0) {
1552 int saved_errno
= errno
;
1553 rollback_index_files();
1554 die(_("could not read commit message: %s"), strerror(saved_errno
));
1557 if (verbose
|| /* Truncate the message just before the diff, if any. */
1558 cleanup_mode
== COMMIT_MSG_CLEANUP_SCISSORS
)
1559 strbuf_setlen(&sb
, wt_status_locate_end(sb
.buf
, sb
.len
));
1560 if (cleanup_mode
!= COMMIT_MSG_CLEANUP_NONE
)
1561 strbuf_stripspace(&sb
, cleanup_mode
== COMMIT_MSG_CLEANUP_ALL
);
1563 if (message_is_empty(&sb
, cleanup_mode
) && !allow_empty_message
) {
1564 rollback_index_files();
1565 fprintf(stderr
, _("Aborting commit due to empty commit message.\n"));
1568 if (template_untouched(&sb
, template_file
, cleanup_mode
) && !allow_empty_message
) {
1569 rollback_index_files();
1570 fprintf(stderr
, _("Aborting commit; you did not edit the message.\n"));
1575 const char *exclude_gpgsig
[2] = { "gpgsig", NULL
};
1576 extra
= read_commit_extra_headers(current_head
, exclude_gpgsig
);
1578 struct commit_extra_header
**tail
= &extra
;
1579 append_merge_tag_headers(parents
, &tail
);
1582 if (commit_tree_extended(sb
.buf
, sb
.len
, &active_cache_tree
->oid
,
1583 parents
, &oid
, author_ident
.buf
, sign_commit
,
1585 rollback_index_files();
1586 die(_("failed to write commit object"));
1588 strbuf_release(&author_ident
);
1589 free_commit_extra_headers(extra
);
1591 if (update_head_with_reflog(current_head
, &oid
, reflog_msg
, &sb
,
1593 rollback_index_files();
1597 unlink(git_path_cherry_pick_head());
1598 unlink(git_path_revert_head());
1599 unlink(git_path_merge_head());
1600 unlink(git_path_merge_msg());
1601 unlink(git_path_merge_mode());
1602 unlink(git_path_squash_msg());
1604 if (commit_index_files())
1605 die (_("Repository has been updated, but unable to write\n"
1606 "new_index file. Check that disk is not full and quota is\n"
1607 "not exceeded, and then \"git reset HEAD\" to recover."));
1610 run_command_v_opt(argv_gc_auto
, RUN_GIT_CMD
);
1611 run_commit_hook(use_editor
, get_index_file(), "post-commit", NULL
);
1612 if (amend
&& !no_post_rewrite
) {
1613 commit_post_rewrite(current_head
, &oid
);
1616 unsigned int flags
= 0;
1619 flags
|= SUMMARY_INITIAL_COMMIT
;
1620 if (author_date_is_interesting())
1621 flags
|= SUMMARY_SHOW_AUTHOR_DATE
;
1622 print_commit_summary(prefix
, &oid
, flags
);