blob: b50e33ef483a612f8b4d83ccc152a7fe279c20b7 [file] [log] [blame]
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001/*
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"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07009#include "config.h"
Michael Haggerty697cc8e2014-10-01 12:28:42 +020010#include "lockfile.h"
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -050011#include "cache-tree.h"
Matthias Kestenholz6b2f2d92008-02-18 08:26:03 +010012#include "color.h"
Junio C Hamano28886052007-11-18 01:52:55 -080013#include "dir.h"
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -050014#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"
Johannes Schindelinc455c872008-07-21 19:03:49 +010026#include "string-list.h"
Stephan Beyer5b2fd952008-07-09 14:58:57 +020027#include "rerere.h"
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -080028#include "unpack-trees.h"
Junio C Hamano76e2f7c2009-08-07 23:31:57 -070029#include "quote.h"
Jens Lehmann302ad7a2010-08-06 00:40:48 +020030#include "submodule.h"
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070031#include "gpg-interface.h"
Nguyễn Thái Ngọc Duy323d0532012-04-13 17:54:39 +070032#include "column.h"
Miklos Vajna5ed75e22012-09-14 08:52:03 +020033#include "sequencer.h"
Antoine Pelisseea167942013-08-23 15:48:31 +020034#include "mailmap.h"
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -050035
36static const char * const builtin_commit_usage[] = {
Alex Henrie9c9b4f22015-01-13 00:44:47 -070037 N_("git commit [<options>] [--] <pathspec>..."),
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -050038 NULL
39};
40
Shawn Bohrer2f02b252007-12-02 23:02:09 -060041static const char * const builtin_status_usage[] = {
Alex Henrie9c9b4f22015-01-13 00:44:47 -070042 N_("git status [<options>] [--] <pathspec>..."),
Shawn Bohrer2f02b252007-12-02 23:02:09 -060043 NULL
44};
45
Jeff Kingf197ed22010-06-06 20:41:46 -040046static const char empty_amend_advice[] =
Ævar Arnfjörð Bjarmasonfc88e312011-02-22 23:41:49 +000047N_("You asked to amend the most recent commit, but doing so would make\n"
Jeff Kingf197ed22010-06-06 20:41:46 -040048"it empty. You can repeat your command with --allow-empty, or you can\n"
Ævar Arnfjörð Bjarmasonfc88e312011-02-22 23:41:49 +000049"remove the commit entirely with \"git reset HEAD^\".\n");
Jeff Kingf197ed22010-06-06 20:41:46 -040050
Jay Soffian37f7a852011-02-19 23:12:29 -050051static const char empty_cherry_pick_advice[] =
Junio C Hamano6c80cd22011-04-01 17:55:55 -070052N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
Jay Soffian37f7a852011-02-19 23:12:29 -050053"If you wish to commit it anyway, use:\n"
54"\n"
55" git commit --allow-empty\n"
Jeff Kingc17592a2013-07-26 19:39:28 -040056"\n");
57
58static const char empty_cherry_pick_advice_single[] =
59N_("Otherwise, please use 'git reset'\n");
60
61static const char empty_cherry_pick_advice_multi[] =
62N_("If you wish to skip this commit, use:\n"
Jay Soffian37f7a852011-02-19 23:12:29 -050063"\n"
Jeff Kingc17592a2013-07-26 19:39:28 -040064" git reset\n"
65"\n"
66"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
67"the remaining commits.\n");
Jay Soffian37f7a852011-02-19 23:12:29 -050068
Jay Soffian37f7a852011-02-19 23:12:29 -050069static const char *use_message_buffer;
Junio C Hamano28886052007-11-18 01:52:55 -080070static struct lock_file index_lock; /* real index */
71static struct lock_file false_lock; /* used only for partial commits */
72static enum {
73 COMMIT_AS_IS = 1,
74 COMMIT_NORMAL,
Gary V. Vaughan4b055482010-05-14 09:31:35 +000075 COMMIT_PARTIAL
Junio C Hamano28886052007-11-18 01:52:55 -080076} commit_style;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -050077
Junio C Hamanodbd0f5c2008-08-06 11:43:47 -070078static const char *logfile, *force_author;
Brian Hetro984c6e72008-07-05 01:24:40 -040079static const char *template_file;
Jay Soffian37f7a852011-02-19 23:12:29 -050080/*
81 * The _message variables are commit names from which to take
82 * the commit message and/or authorship.
83 */
84static const char *author_message, *author_message_buffer;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -050085static char *edit_message, *use_message;
Pat Notz89ac1222010-11-02 13:59:11 -060086static char *fixup_message, *squash_message;
Junio C Hamanoca1ba202011-12-06 13:09:55 -080087static int all, also, interactive, patch_interactive, only, amend, signoff;
88static int edit_flag = -1; /* unspecified */
Erick Mattosc51f6ce2009-11-04 01:20:11 -020089static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
Pranit Bauvaaaab8422016-05-05 15:20:02 +053090static int config_commit_verbose = -1; /* unspecified */
Ævar Arnfjörð Bjarmasonc9b5fde2010-04-06 08:40:35 +000091static int no_post_rewrite, allow_empty_message;
Jameson Millereec0f7f2017-10-30 13:21:37 -040092static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
Junio C Hamanoba3c69a2011-10-05 17:23:20 -070093static char *sign_commit;
94
Alex Riesen5f065732007-12-22 19:46:24 +010095/*
96 * The default commit message cleanup mode will remove the lines
97 * beginning with # (shell comments) and leading and trailing
98 * whitespaces (empty lines or containing only whitespaces)
99 * if editor is used, and only the whitespaces if the message
100 * is specified explicitly.
101 */
Phillip Woodd0aaa462017-11-10 11:09:42 +0000102static enum commit_msg_cleanup_mode cleanup_mode;
Ralf Thielow51fb3a32013-01-10 18:45:59 +0100103static const char *cleanup_arg;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500104
Jay Soffian37f7a852011-02-19 23:12:29 -0500105static enum commit_whence whence;
Jeff Kingc17592a2013-07-26 19:39:28 -0400106static int sequencer_in_use;
Junio C Hamano06bb6432011-08-19 11:58:18 -0700107static int use_editor = 1, include_status = 1;
Jameson Millereec0f7f2017-10-30 13:21:37 -0400108static int have_option_m;
Jeff King2c477892011-12-18 00:03:22 -0500109static struct strbuf message = STRBUF_INIT;
Johannes Schindelinf9568532007-11-11 17:36:39 +0000110
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -0400111static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
Junio C Hamano84b42022013-06-24 11:41:40 -0700112
Jeff Hostetlerc4f596b2016-08-05 18:00:28 -0400113static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset)
114{
115 enum wt_status_format *value = (enum wt_status_format *)opt->value;
116 if (unset)
117 *value = STATUS_FORMAT_NONE;
118 else if (!arg)
119 *value = STATUS_FORMAT_PORCELAIN;
120 else if (!strcmp(arg, "v1") || !strcmp(arg, "1"))
121 *value = STATUS_FORMAT_PORCELAIN;
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -0400122 else if (!strcmp(arg, "v2") || !strcmp(arg, "2"))
123 *value = STATUS_FORMAT_PORCELAIN_V2;
Jeff Hostetlerc4f596b2016-08-05 18:00:28 -0400124 else
125 die("unsupported porcelain version '%s'", arg);
126
127 return 0;
128}
Jeff King7c9f7032009-09-05 04:59:56 -0400129
Johannes Schindelinf9568532007-11-11 17:36:39 +0000130static int opt_parse_m(const struct option *opt, const char *arg, int unset)
131{
132 struct strbuf *buf = opt->value;
René Scharfe25206772013-05-25 23:43:34 +0200133 if (unset) {
134 have_option_m = 0;
Johannes Schindelinf9568532007-11-11 17:36:39 +0000135 strbuf_setlen(buf, 0);
René Scharfe25206772013-05-25 23:43:34 +0200136 } else {
137 have_option_m = 1;
Brandon Caseya24a41e2013-02-18 20:17:06 -0800138 if (buf->len)
139 strbuf_addch(buf, '\n');
Johannes Schindelinf9568532007-11-11 17:36:39 +0000140 strbuf_addstr(buf, arg);
Brandon Caseya24a41e2013-02-18 20:17:06 -0800141 strbuf_complete_line(buf);
Johannes Schindelinf9568532007-11-11 17:36:39 +0000142 }
143 return 0;
144}
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500145
Ben Pearte8b2dc22018-05-11 15:38:58 +0000146static int opt_parse_rename_score(const struct option *opt, const char *arg, int unset)
147{
148 const char **value = opt->value;
149 if (arg != NULL && *arg == '=')
150 arg = arg + 1;
151
152 *value = arg;
153 return 0;
154}
155
Jay Soffian37f7a852011-02-19 23:12:29 -0500156static void determine_whence(struct wt_status *s)
157{
Jeff Kingf9327292015-08-10 05:38:57 -0400158 if (file_exists(git_path_merge_head()))
Jay Soffian37f7a852011-02-19 23:12:29 -0500159 whence = FROM_MERGE;
Jeff Kingf9327292015-08-10 05:38:57 -0400160 else if (file_exists(git_path_cherry_pick_head())) {
Jay Soffian37f7a852011-02-19 23:12:29 -0500161 whence = FROM_CHERRY_PICK;
Johannes Schindelin8a2a0f52016-10-14 15:17:12 +0200162 if (file_exists(git_path_seq_dir()))
Jeff Kingc17592a2013-07-26 19:39:28 -0400163 sequencer_in_use = 1;
164 }
Jay Soffian37f7a852011-02-19 23:12:29 -0500165 else
166 whence = FROM_COMMIT;
167 if (s)
168 s->whence = whence;
169}
170
Matthieu Moy5c25dfa2013-09-12 12:50:04 +0200171static void status_init_config(struct wt_status *s, config_fn_t fn)
172{
173 wt_status_prepare(s);
Eckhard S. Maaßdc6b1d92018-05-04 13:12:15 +0200174 init_diff_ui_defaults();
Matthieu Moy5c25dfa2013-09-12 12:50:04 +0200175 git_config(fn, s);
176 determine_whence(s);
Matthieu Moy6a964f52013-09-12 12:50:05 +0200177 s->hints = advice_status_hints; /* must come after git_config() */
Matthieu Moy5c25dfa2013-09-12 12:50:04 +0200178}
179
Junio C Hamano28886052007-11-18 01:52:55 -0800180static void rollback_index_files(void)
181{
182 switch (commit_style) {
183 case COMMIT_AS_IS:
184 break; /* nothing to do */
185 case COMMIT_NORMAL:
186 rollback_lock_file(&index_lock);
187 break;
188 case COMMIT_PARTIAL:
189 rollback_lock_file(&index_lock);
190 rollback_lock_file(&false_lock);
191 break;
192 }
193}
194
Brandon Casey5a9dd392008-01-23 11:21:22 -0600195static int commit_index_files(void)
Junio C Hamano28886052007-11-18 01:52:55 -0800196{
Brandon Casey5a9dd392008-01-23 11:21:22 -0600197 int err = 0;
198
Junio C Hamano28886052007-11-18 01:52:55 -0800199 switch (commit_style) {
200 case COMMIT_AS_IS:
201 break; /* nothing to do */
202 case COMMIT_NORMAL:
Brandon Casey5a9dd392008-01-23 11:21:22 -0600203 err = commit_lock_file(&index_lock);
Junio C Hamano28886052007-11-18 01:52:55 -0800204 break;
205 case COMMIT_PARTIAL:
Brandon Casey5a9dd392008-01-23 11:21:22 -0600206 err = commit_lock_file(&index_lock);
Junio C Hamano28886052007-11-18 01:52:55 -0800207 rollback_lock_file(&false_lock);
208 break;
209 }
Brandon Casey5a9dd392008-01-23 11:21:22 -0600210
211 return err;
Junio C Hamano28886052007-11-18 01:52:55 -0800212}
213
214/*
215 * Take a union of paths in the index and the named tree (typically, "HEAD"),
216 * and return the paths that match the given pattern in list.
217 */
Johannes Schindelinc455c872008-07-21 19:03:49 +0100218static int list_paths(struct string_list *list, const char *with_tree,
Nguyễn Thái Ngọc Duy17ddc662013-07-14 15:35:53 +0700219 const char *prefix, const struct pathspec *pattern)
Junio C Hamano28886052007-11-18 01:52:55 -0800220{
Stefan Beller5d0b9bf2015-03-20 17:28:07 -0700221 int i, ret;
Junio C Hamano28886052007-11-18 01:52:55 -0800222 char *m;
223
Nguyễn Thái Ngọc Duy17ddc662013-07-14 15:35:53 +0700224 if (!pattern->nr)
Junio C Hamanob9a08012012-07-15 21:39:48 -0700225 return 0;
226
Nguyễn Thái Ngọc Duy17ddc662013-07-14 15:35:53 +0700227 m = xcalloc(1, pattern->nr);
Junio C Hamano28886052007-11-18 01:52:55 -0800228
Clemens Buchacher8894d532011-07-30 19:13:47 +0200229 if (with_tree) {
Clemens Buchacherf950eb92011-09-04 12:42:01 +0200230 char *max_prefix = common_prefix(pattern);
Brandon Williams86238e02018-04-03 10:57:45 -0700231 overlay_tree_on_index(&the_index, with_tree, max_prefix);
Clemens Buchacher5879f562011-09-04 12:41:59 +0200232 free(max_prefix);
Clemens Buchacher8894d532011-07-30 19:13:47 +0200233 }
Junio C Hamano28886052007-11-18 01:52:55 -0800234
235 for (i = 0; i < active_nr; i++) {
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +0700236 const struct cache_entry *ce = active_cache[i];
Nguyễn Thái Ngọc Duy7fce6e32009-12-14 18:43:59 +0700237 struct string_list_item *item;
238
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800239 if (ce->ce_flags & CE_UPDATE)
Junio C Hamanoe87e22d2008-01-14 13:54:24 -0800240 continue;
Nguyễn Thái Ngọc Duy429bb402014-01-24 20:40:28 +0700241 if (!ce_path_match(ce, pattern, m))
Junio C Hamano28886052007-11-18 01:52:55 -0800242 continue;
Julian Phillips78a395d2010-06-26 00:41:35 +0100243 item = string_list_insert(list, ce->name);
Nguyễn Thái Ngọc Duy7fce6e32009-12-14 18:43:59 +0700244 if (ce_skip_worktree(ce))
245 item->util = item; /* better a valid pointer than a fake one */
Junio C Hamano28886052007-11-18 01:52:55 -0800246 }
247
Stefan Beller5d0b9bf2015-03-20 17:28:07 -0700248 ret = report_path_error(m, pattern, prefix);
249 free(m);
250 return ret;
Junio C Hamano28886052007-11-18 01:52:55 -0800251}
252
Johannes Schindelinc455c872008-07-21 19:03:49 +0100253static void add_remove_files(struct string_list *list)
Junio C Hamano28886052007-11-18 01:52:55 -0800254{
255 int i;
256 for (i = 0; i < list->nr; i++) {
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700257 struct stat st;
Johannes Schindelinc455c872008-07-21 19:03:49 +0100258 struct string_list_item *p = &(list->items[i]);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700259
Nguyễn Thái Ngọc Duy7fce6e32009-12-14 18:43:59 +0700260 /* p->util is skip-worktree */
261 if (p->util)
Nguyễn Thái Ngọc Duyb4d16902009-08-20 20:46:58 +0700262 continue;
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700263
Johannes Schindelinc455c872008-07-21 19:03:49 +0100264 if (!lstat(p->string, &st)) {
265 if (add_to_cache(p->string, &st, 0))
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000266 die(_("updating files failed"));
Alex Riesen960b8ad2008-05-12 19:57:45 +0200267 } else
Johannes Schindelinc455c872008-07-21 19:03:49 +0100268 remove_file_from_cache(p->string);
Junio C Hamano28886052007-11-18 01:52:55 -0800269 }
270}
271
Junio C Hamano06bb6432011-08-19 11:58:18 -0700272static void create_base_index(const struct commit *current_head)
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800273{
274 struct tree *tree;
275 struct unpack_trees_options opts;
276 struct tree_desc t;
277
Junio C Hamano06bb6432011-08-19 11:58:18 -0700278 if (!current_head) {
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800279 discard_cache();
280 return;
281 }
282
283 memset(&opts, 0, sizeof(opts));
284 opts.head_idx = 1;
285 opts.index_only = 1;
286 opts.merge = 1;
Linus Torvalds34110cd2008-03-06 18:12:28 -0800287 opts.src_index = &the_index;
288 opts.dst_index = &the_index;
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800289
290 opts.fn = oneway_merge;
brian m. carlsona9dbc172017-05-06 22:10:37 +0000291 tree = parse_tree_indirect(&current_head->object.oid);
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800292 if (!tree)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000293 die(_("failed to unpack HEAD tree object"));
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800294 parse_tree(tree);
295 init_tree_desc(&t, tree->buffer, tree->size);
Daniel Barkalow203a2fe2008-02-07 11:39:48 -0500296 if (unpack_trees(1, &t, &opts))
297 exit(128); /* We've already reported the error, finish dying */
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800298}
299
Matthieu Moyd38a30d2010-01-12 10:54:44 +0100300static void refresh_cache_or_die(int refresh_flags)
301{
302 /*
303 * refresh_flags contains REFRESH_QUIET, so the only errors
304 * are for unmerged entries.
305 */
306 if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN))
307 die_resolve_conflict("commit");
308}
309
Michael Haggerty35ff08b2014-10-01 12:28:17 +0200310static const char *prepare_index(int argc, const char **argv, const char *prefix,
311 const struct commit *current_head, int is_status)
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500312{
Martin Ågrendd1055e2017-09-23 01:34:49 +0200313 struct string_list partial = STRING_LIST_INIT_DUP;
Nguyễn Thái Ngọc Duy6654c882013-07-14 15:35:38 +0700314 struct pathspec pathspec;
Junio C Hamano50b7e702009-08-04 23:49:33 -0700315 int refresh_flags = REFRESH_QUIET;
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200316 const char *ret;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500317
Junio C Hamano50b7e702009-08-04 23:49:33 -0700318 if (is_status)
319 refresh_flags |= REFRESH_UNMERGED;
Nguyễn Thái Ngọc Duy6654c882013-07-14 15:35:38 +0700320 parse_pathspec(&pathspec, 0,
321 PATHSPEC_PREFER_FULL,
322 prefix, argv);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500323
Nguyễn Thái Ngọc Duy5ab2a2d2013-07-14 15:35:49 +0700324 if (read_cache_preload(&pathspec) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000325 die(_("index file corrupt"));
Linus Torvalds671c9b72008-11-13 16:36:30 -0800326
Conrad Irwin1020d082011-05-06 22:59:59 -0700327 if (interactive) {
Elia Pintoe23fd152014-01-30 07:15:56 -0800328 char *old_index_env = NULL;
Junio C Hamanob3e83cc2016-12-07 10:33:54 -0800329 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
Conrad Irwin1020d082011-05-06 22:59:59 -0700330
331 refresh_cache_or_die(refresh_flags);
332
Martin Ågren812d6b02017-10-06 22:12:12 +0200333 if (write_locked_index(&the_index, &index_lock, 0))
Conrad Irwin1020d082011-05-06 22:59:59 -0700334 die(_("unable to create temporary index"));
335
336 old_index_env = getenv(INDEX_ENVIRONMENT);
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200337 setenv(INDEX_ENVIRONMENT, get_lock_file_path(&index_lock), 1);
Conrad Irwin1020d082011-05-06 22:59:59 -0700338
Conrad Irwinb4bd4662011-05-07 10:58:07 -0700339 if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
Conrad Irwin1020d082011-05-06 22:59:59 -0700340 die(_("interactive add failed"));
341
342 if (old_index_env && *old_index_env)
343 setenv(INDEX_ENVIRONMENT, old_index_env, 1);
344 else
345 unsetenv(INDEX_ENVIRONMENT);
346
347 discard_cache();
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200348 read_cache_from(get_lock_file_path(&index_lock));
David Turner9c4d6c02014-07-13 13:28:19 -0700349 if (update_main_cache_tree(WRITE_TREE_SILENT) == 0) {
Junio C Hamano3fd13cb2014-09-11 10:33:32 -0700350 if (reopen_lock_file(&index_lock) < 0)
David Turner9c4d6c02014-07-13 13:28:19 -0700351 die(_("unable to write index file"));
Martin Ågren812d6b02017-10-06 22:12:12 +0200352 if (write_locked_index(&the_index, &index_lock, 0))
Junio C Hamano3fd13cb2014-09-11 10:33:32 -0700353 die(_("unable to update temporary index"));
David Turner9c4d6c02014-07-13 13:28:19 -0700354 } else
355 warning(_("Failed to update main cache tree"));
Conrad Irwin1020d082011-05-06 22:59:59 -0700356
357 commit_style = COMMIT_NORMAL;
Martin Ågrendd1055e2017-09-23 01:34:49 +0200358 ret = get_lock_file_path(&index_lock);
359 goto out;
Conrad Irwin1020d082011-05-06 22:59:59 -0700360 }
361
Junio C Hamano28886052007-11-18 01:52:55 -0800362 /*
363 * Non partial, non as-is commit.
364 *
365 * (1) get the real index;
366 * (2) update the_index as necessary;
367 * (3) write the_index out to the real index (still locked);
368 * (4) return the name of the locked index file.
369 *
370 * The caller should run hooks on the locked real index, and
371 * (A) if all goes well, commit the real index;
372 * (B) on failure, rollback the real index.
373 */
Nguyễn Thái Ngọc Duy6654c882013-07-14 15:35:38 +0700374 if (all || (also && pathspec.nr)) {
Junio C Hamanob3e83cc2016-12-07 10:33:54 -0800375 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
Thomas Gummerer610d55a2016-09-14 22:07:47 +0100376 add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
Matthieu Moyd38a30d2010-01-12 10:54:44 +0100377 refresh_cache_or_die(refresh_flags);
Nguyễn Thái Ngọc Duye859c692012-01-16 09:36:46 +0700378 update_main_cache_tree(WRITE_TREE_SILENT);
Martin Ågren812d6b02017-10-06 22:12:12 +0200379 if (write_locked_index(&the_index, &index_lock, 0))
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000380 die(_("unable to write new_index file"));
Junio C Hamano28886052007-11-18 01:52:55 -0800381 commit_style = COMMIT_NORMAL;
Martin Ågrendd1055e2017-09-23 01:34:49 +0200382 ret = get_lock_file_path(&index_lock);
383 goto out;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500384 }
385
Junio C Hamano28886052007-11-18 01:52:55 -0800386 /*
387 * As-is commit.
388 *
389 * (1) return the name of the real index file.
390 *
Markus Heidelberg73276232010-04-02 14:27:18 +0200391 * The caller should run hooks on the real index,
392 * and create commit from the_index.
Junio C Hamano28886052007-11-18 01:52:55 -0800393 * We still need to refresh the index here.
394 */
Nguyễn Thái Ngọc Duy6654c882013-07-14 15:35:38 +0700395 if (!only && !pathspec.nr) {
Junio C Hamanob3e83cc2016-12-07 10:33:54 -0800396 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
Matthieu Moyd38a30d2010-01-12 10:54:44 +0100397 refresh_cache_or_die(refresh_flags);
David Turner9c4d6c02014-07-13 13:28:19 -0700398 if (active_cache_changed
David Turner475a3442015-08-27 13:07:54 -0400399 || !cache_tree_fully_valid(active_cache_tree))
Nguyễn Thái Ngọc Duye859c692012-01-16 09:36:46 +0700400 update_main_cache_tree(WRITE_TREE_SILENT);
Martin Ågren61000812018-03-01 21:40:20 +0100401 if (write_locked_index(&the_index, &index_lock,
402 COMMIT_LOCK | SKIP_IF_UNCHANGED))
403 die(_("unable to write new_index file"));
Junio C Hamano28886052007-11-18 01:52:55 -0800404 commit_style = COMMIT_AS_IS;
Martin Ågrendd1055e2017-09-23 01:34:49 +0200405 ret = get_index_file();
406 goto out;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500407 }
408
Junio C Hamano28886052007-11-18 01:52:55 -0800409 /*
410 * A partial commit.
411 *
412 * (0) find the set of affected paths;
413 * (1) get lock on the real index file;
414 * (2) update the_index with the given paths;
415 * (3) write the_index out to the real index (still locked);
416 * (4) get lock on the false index file;
417 * (5) reset the_index from HEAD;
418 * (6) update the_index the same way as (2);
419 * (7) write the_index out to the false index file;
420 * (8) return the name of the false index file (still locked);
421 *
422 * The caller should run hooks on the locked false index, and
423 * create commit from it. Then
424 * (A) if all goes well, commit the real index;
425 * (B) on failure, rollback the real index;
426 * In either case, rollback the false index.
427 */
428 commit_style = COMMIT_PARTIAL;
429
Ævar Arnfjörð Bjarmasonb0cea472012-04-30 15:33:13 +0000430 if (whence != FROM_COMMIT) {
431 if (whence == FROM_MERGE)
432 die(_("cannot do a partial commit during a merge."));
433 else if (whence == FROM_CHERRY_PICK)
434 die(_("cannot do a partial commit during a cherry-pick."));
435 }
Junio C Hamano28886052007-11-18 01:52:55 -0800436
Nguyễn Thái Ngọc Duy17ddc662013-07-14 15:35:53 +0700437 if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
Junio C Hamano28886052007-11-18 01:52:55 -0800438 exit(1);
439
440 discard_cache();
441 if (read_cache() < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000442 die(_("cannot read the index"));
Junio C Hamano28886052007-11-18 01:52:55 -0800443
Junio C Hamanob3e83cc2016-12-07 10:33:54 -0800444 hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
Junio C Hamano28886052007-11-18 01:52:55 -0800445 add_remove_files(&partial);
Kristian Høgsbergef12b502007-11-12 15:48:22 -0500446 refresh_cache(REFRESH_QUIET);
David Turner9c4d6c02014-07-13 13:28:19 -0700447 update_main_cache_tree(WRITE_TREE_SILENT);
Martin Ågren812d6b02017-10-06 22:12:12 +0200448 if (write_locked_index(&the_index, &index_lock, 0))
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000449 die(_("unable to write new_index file"));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500450
Nguyễn Thái Ngọc Duy03b86642014-06-13 19:19:23 +0700451 hold_lock_file_for_update(&false_lock,
452 git_path("next-index-%"PRIuMAX,
453 (uintmax_t) getpid()),
454 LOCK_DIE_ON_ERROR);
Linus Torvaldsfa9dcf82008-01-13 00:30:56 -0800455
Junio C Hamano06bb6432011-08-19 11:58:18 -0700456 create_base_index(current_head);
Junio C Hamano28886052007-11-18 01:52:55 -0800457 add_remove_files(&partial);
Kristian Høgsbergd37d3202007-11-09 11:40:27 -0500458 refresh_cache(REFRESH_QUIET);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500459
Martin Ågren812d6b02017-10-06 22:12:12 +0200460 if (write_locked_index(&the_index, &false_lock, 0))
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000461 die(_("unable to write temporary index file"));
Jeff King959ba672008-02-14 12:18:23 -0500462
463 discard_cache();
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200464 ret = get_lock_file_path(&false_lock);
465 read_cache_from(ret);
Martin Ågrendd1055e2017-09-23 01:34:49 +0200466out:
467 string_list_clear(&partial, 0);
468 clear_pathspec(&pathspec);
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200469 return ret;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500470}
471
Junio C Hamanod249b092009-08-09 21:59:30 -0700472static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
473 struct wt_status *s)
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500474{
brian m. carlson8066df42017-02-20 00:10:14 +0000475 struct object_id oid;
Junio C Hamano76e2f7c2009-08-07 23:31:57 -0700476
Junio C Hamanod249b092009-08-09 21:59:30 -0700477 if (s->relative_paths)
478 s->prefix = prefix;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500479
480 if (amend) {
Junio C Hamanod249b092009-08-09 21:59:30 -0700481 s->amend = 1;
482 s->reference = "HEAD^1";
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500483 }
Junio C Hamanod249b092009-08-09 21:59:30 -0700484 s->verbose = verbose;
485 s->index_file = index_file;
486 s->fp = fp;
487 s->nowarn = nowarn;
brian m. carlsone82caf32017-07-13 23:49:28 +0000488 s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -0400489 if (!s->is_initial)
brian m. carlson8066df42017-02-20 00:10:14 +0000490 hashcpy(s->sha1_commit, oid.hash);
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -0400491 s->status_format = status_format;
492 s->ignore_submodule_arg = ignore_submodule_arg;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500493
Junio C Hamano76e2f7c2009-08-07 23:31:57 -0700494 wt_status_collect(s);
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -0400495 wt_status_print(s);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500496
Junio C Hamanod249b092009-08-09 21:59:30 -0700497 return s->commitable;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500498}
499
Junio C Hamano06bb6432011-08-19 11:58:18 -0700500static int is_a_merge(const struct commit *current_head)
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100501{
Junio C Hamano06bb6432011-08-19 11:58:18 -0700502 return !!(current_head->parents && current_head->parents->next);
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100503}
504
Jeff Kingfac90832014-12-10 10:42:10 -0500505static void assert_split_ident(struct ident_split *id, const struct strbuf *buf)
506{
Jeff Kingc83a5092014-12-10 10:43:42 -0500507 if (split_ident_line(id, buf->buf, buf->len) || !id->date_begin)
Jeff Kingfac90832014-12-10 10:42:10 -0500508 die("BUG: unable to parse our own ident: %s", buf->buf);
509}
510
Junio C Hamano7dfe8ad2012-03-11 03:12:10 -0700511static void export_one(const char *var, const char *s, const char *e, int hack)
512{
513 struct strbuf buf = STRBUF_INIT;
514 if (hack)
515 strbuf_addch(&buf, hack);
516 strbuf_addf(&buf, "%.*s", (int)(e - s), s);
517 setenv(var, buf.buf, 1);
518 strbuf_release(&buf);
519}
520
Jeff Kingc33ddc22014-08-27 03:57:08 -0400521static int parse_force_date(const char *in, struct strbuf *out)
Jeff King14ac2862014-05-01 21:12:42 -0400522{
Jeff Kingc33ddc22014-08-27 03:57:08 -0400523 strbuf_addch(out, '@');
Jeff King14ac2862014-05-01 21:12:42 -0400524
Jeff Kingc33ddc22014-08-27 03:57:08 -0400525 if (parse_date(in, out) < 0) {
Jeff King14ac2862014-05-01 21:12:42 -0400526 int errors = 0;
527 unsigned long t = approxidate_careful(in, &errors);
528 if (errors)
529 return -1;
Jeff Kingc33ddc22014-08-27 03:57:08 -0400530 strbuf_addf(out, "%lu", t);
Jeff King14ac2862014-05-01 21:12:42 -0400531 }
532
533 return 0;
534}
535
Jeff Kingf4ef5172014-08-27 03:57:56 -0400536static void set_ident_var(char **buf, char *val)
537{
538 free(*buf);
539 *buf = val;
540}
541
Junio C Hamano4c28e4a2010-12-20 17:00:36 -0800542static void determine_author_info(struct strbuf *author_ident)
Santi Béjara45d46b2008-05-04 18:04:49 +0200543{
544 char *name, *email, *date;
Junio C Hamano7dfe8ad2012-03-11 03:12:10 -0700545 struct ident_split author;
Santi Béjara45d46b2008-05-04 18:04:49 +0200546
Jeff Kingeaa541e2015-01-12 20:58:33 -0500547 name = xstrdup_or_null(getenv("GIT_AUTHOR_NAME"));
548 email = xstrdup_or_null(getenv("GIT_AUTHOR_EMAIL"));
549 date = xstrdup_or_null(getenv("GIT_AUTHOR_DATE"));
Santi Béjara45d46b2008-05-04 18:04:49 +0200550
Jay Soffian37f7a852011-02-19 23:12:29 -0500551 if (author_message) {
Jeff Kingf0f96622014-08-27 03:57:28 -0400552 struct ident_split ident;
Junio C Hamano2c733fb2012-02-02 13:41:43 -0800553 size_t len;
Jeff Kingf0f96622014-08-27 03:57:28 -0400554 const char *a;
Santi Béjara45d46b2008-05-04 18:04:49 +0200555
Jeff Kingf0f96622014-08-27 03:57:28 -0400556 a = find_commit_header(author_message_buffer, "author", &len);
Santi Béjara45d46b2008-05-04 18:04:49 +0200557 if (!a)
Jeff Kingf0f96622014-08-27 03:57:28 -0400558 die(_("commit '%s' lacks author header"), author_message);
559 if (split_ident_line(&ident, a, len) < 0)
560 die(_("commit '%s' has malformed author line"), author_message);
Santi Béjara45d46b2008-05-04 18:04:49 +0200561
Jeff Kingf4ef5172014-08-27 03:57:56 -0400562 set_ident_var(&name, xmemdupz(ident.name_begin, ident.name_end - ident.name_begin));
563 set_ident_var(&email, xmemdupz(ident.mail_begin, ident.mail_end - ident.mail_begin));
Santi Béjara45d46b2008-05-04 18:04:49 +0200564
Jeff Kingf0f96622014-08-27 03:57:28 -0400565 if (ident.date_begin) {
Jeff Kingf4ef5172014-08-27 03:57:56 -0400566 struct strbuf date_buf = STRBUF_INIT;
Jeff Kingf0f96622014-08-27 03:57:28 -0400567 strbuf_addch(&date_buf, '@');
568 strbuf_add(&date_buf, ident.date_begin, ident.date_end - ident.date_begin);
569 strbuf_addch(&date_buf, ' ');
570 strbuf_add(&date_buf, ident.tz_begin, ident.tz_end - ident.tz_begin);
Jeff Kingf4ef5172014-08-27 03:57:56 -0400571 set_ident_var(&date, strbuf_detach(&date_buf, NULL));
Jeff Kingf0f96622014-08-27 03:57:28 -0400572 }
Santi Béjara45d46b2008-05-04 18:04:49 +0200573 }
574
575 if (force_author) {
Jeff Kingf0f96622014-08-27 03:57:28 -0400576 struct ident_split ident;
Santi Béjara45d46b2008-05-04 18:04:49 +0200577
Jeff Kingf0f96622014-08-27 03:57:28 -0400578 if (split_ident_line(&ident, force_author, strlen(force_author)) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000579 die(_("malformed --author parameter"));
Jeff Kingf4ef5172014-08-27 03:57:56 -0400580 set_ident_var(&name, xmemdupz(ident.name_begin, ident.name_end - ident.name_begin));
581 set_ident_var(&email, xmemdupz(ident.mail_begin, ident.mail_end - ident.mail_begin));
Santi Béjara45d46b2008-05-04 18:04:49 +0200582 }
583
Jeff King14ac2862014-05-01 21:12:42 -0400584 if (force_date) {
Jeff Kingf4ef5172014-08-27 03:57:56 -0400585 struct strbuf date_buf = STRBUF_INIT;
Jeff Kingc33ddc22014-08-27 03:57:08 -0400586 if (parse_force_date(force_date, &date_buf))
Jeff King14ac2862014-05-01 21:12:42 -0400587 die(_("invalid date format: %s"), force_date);
Jeff Kingf4ef5172014-08-27 03:57:56 -0400588 set_ident_var(&date, strbuf_detach(&date_buf, NULL));
Jeff King14ac2862014-05-01 21:12:42 -0400589 }
590
Jeff Kingf9bc5732012-05-24 19:28:40 -0400591 strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT));
Jeff Kingc83a5092014-12-10 10:43:42 -0500592 assert_split_ident(&author, author_ident);
593 export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0);
594 export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0);
595 export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@');
Jeff Kingf4ef5172014-08-27 03:57:56 -0400596 free(name);
597 free(email);
598 free(date);
Santi Béjara45d46b2008-05-04 18:04:49 +0200599}
600
Jeff Kingb7242b82014-05-01 21:10:01 -0400601static int author_date_is_interesting(void)
602{
603 return author_message || force_date;
Junio C Hamano4c28e4a2010-12-20 17:00:36 -0800604}
605
Nguyễn Thái Ngọc Duy84c9dc22014-05-17 08:52:23 +0700606static void adjust_comment_line_char(const struct strbuf *sb)
607{
608 char candidates[] = "#;@!$%^&|:";
609 char *candidate;
610 const char *p;
611
612 comment_line_char = candidates[0];
613 if (!memchr(sb->buf, comment_line_char, sb->len))
614 return;
615
616 p = sb->buf;
617 candidate = strchr(candidates, *p);
618 if (candidate)
619 *candidate = ' ';
620 for (p = sb->buf; *p; p++) {
621 if ((p[0] == '\n' || p[0] == '\r') && p[1]) {
622 candidate = strchr(candidates, p[1]);
623 if (candidate)
624 *candidate = ' ';
625 }
626 }
627
628 for (p = candidates; *p == ' '; p++)
629 ;
630 if (!*p)
631 die(_("unable to select a comment character that is not used\n"
632 "in the current commit message"));
633 comment_line_char = *p;
634}
635
Junio C Hamanod249b092009-08-09 21:59:30 -0700636static int prepare_to_commit(const char *index_file, const char *prefix,
Junio C Hamano06bb6432011-08-19 11:58:18 -0700637 struct commit *current_head,
Junio C Hamano4c28e4a2010-12-20 17:00:36 -0800638 struct wt_status *s,
639 struct strbuf *author_ident)
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500640{
641 struct stat statbuf;
Junio C Hamano4c28e4a2010-12-20 17:00:36 -0800642 struct strbuf committer_ident = STRBUF_INIT;
Elia Pintoe23fd152014-01-30 07:15:56 -0800643 int commitable;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500644 struct strbuf sb = STRBUF_INIT;
Paolo Bonzini8089c852008-02-05 08:04:18 +0100645 const char *hook_arg1 = NULL;
646 const char *hook_arg2 = NULL;
Phillip Woodd0aaa462017-11-10 11:09:42 +0000647 int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE);
Matthieu Moy2556b992013-09-06 19:43:07 +0200648 int old_display_comment_prefix;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500649
Junio C Hamano7dfe8ad2012-03-11 03:12:10 -0700650 /* This checks and barfs if author is badly specified */
651 determine_author_info(author_ident);
652
Benoit Pierre15048f82014-03-18 11:00:53 +0100653 if (!no_verify && run_commit_hook(use_editor, index_file, "pre-commit", NULL))
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100654 return 0;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500655
Pat Notz89ac1222010-11-02 13:59:11 -0600656 if (squash_message) {
657 /*
658 * Insert the proper subject line before other commit
659 * message options add their content.
660 */
661 if (use_message && !strcmp(use_message, squash_message))
662 strbuf_addstr(&sb, "squash! ");
663 else {
664 struct pretty_print_context ctx = {0};
665 struct commit *c;
666 c = lookup_commit_reference_by_name(squash_message);
667 if (!c)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000668 die(_("could not lookup commit %s"), squash_message);
Pat Notz89ac1222010-11-02 13:59:11 -0600669 ctx.output_encoding = get_commit_output_encoding();
670 format_commit_message(c, "squash! %s\n\n", &sb,
671 &ctx);
672 }
673 }
674
Ævar Arnfjörð Bjarmason30884c92017-12-22 20:41:52 +0000675 if (have_option_m && !fixup_message) {
Johannes Schindelinf9568532007-11-11 17:36:39 +0000676 strbuf_addbuf(&sb, &message);
Paolo Bonzini8089c852008-02-05 08:04:18 +0100677 hook_arg1 = "message";
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500678 } else if (logfile && !strcmp(logfile, "-")) {
679 if (isatty(0))
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000680 fprintf(stderr, _("(reading log message from standard input)\n"));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500681 if (strbuf_read(&sb, 0, 0) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000682 die_errno(_("could not read log from standard input"));
Paolo Bonzini8089c852008-02-05 08:04:18 +0100683 hook_arg1 = "message";
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500684 } else if (logfile) {
685 if (strbuf_read_file(&sb, logfile, 0) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000686 die_errno(_("could not read log file '%s'"),
Thomas Rastd824cbb2009-06-27 17:58:46 +0200687 logfile);
Paolo Bonzini8089c852008-02-05 08:04:18 +0100688 hook_arg1 = "message";
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500689 } else if (use_message) {
Elia Pintoe23fd152014-01-30 07:15:56 -0800690 char *buffer;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500691 buffer = strstr(use_message_buffer, "\n\n");
Jeff King076cbd62014-04-25 19:11:15 -0400692 if (buffer)
Johannes Schindelin84e213a2016-06-29 16:14:42 +0200693 strbuf_addstr(&sb, skip_blank_lines(buffer + 2));
Paolo Bonzini8089c852008-02-05 08:04:18 +0100694 hook_arg1 = "commit";
695 hook_arg2 = use_message;
Pat Notzd71b8ba2010-11-02 13:59:09 -0600696 } else if (fixup_message) {
697 struct pretty_print_context ctx = {0};
698 struct commit *commit;
699 commit = lookup_commit_reference_by_name(fixup_message);
700 if (!commit)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000701 die(_("could not lookup commit %s"), fixup_message);
Pat Notzd71b8ba2010-11-02 13:59:09 -0600702 ctx.output_encoding = get_commit_output_encoding();
703 format_commit_message(commit, "fixup! %s\n\n",
704 &sb, &ctx);
Ævar Arnfjörð Bjarmason30884c92017-12-22 20:41:52 +0000705 if (have_option_m)
706 strbuf_addbuf(&sb, &message);
Pat Notzd71b8ba2010-11-02 13:59:09 -0600707 hook_arg1 = "message";
Jeff Kingf9327292015-08-10 05:38:57 -0400708 } else if (!stat(git_path_merge_msg(), &statbuf)) {
Sven Strickrothb64c1e02016-03-21 23:29:40 +0100709 /*
710 * prepend SQUASH_MSG here if it exists and a
711 * "merge --squash" was originally performed
712 */
713 if (!stat(git_path_squash_msg(), &statbuf)) {
714 if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
715 die_errno(_("could not read SQUASH_MSG"));
716 hook_arg1 = "squash";
717 } else
718 hook_arg1 = "merge";
Jeff Kingf9327292015-08-10 05:38:57 -0400719 if (strbuf_read_file(&sb, git_path_merge_msg(), 0) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000720 die_errno(_("could not read MERGE_MSG"));
Jeff Kingf9327292015-08-10 05:38:57 -0400721 } else if (!stat(git_path_squash_msg(), &statbuf)) {
722 if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000723 die_errno(_("could not read SQUASH_MSG"));
Paolo Bonzini8089c852008-02-05 08:04:18 +0100724 hook_arg1 = "squash";
Jonathan Nieder2140b142011-02-25 03:07:57 -0600725 } else if (template_file) {
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500726 if (strbuf_read_file(&sb, template_file, 0) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000727 die_errno(_("could not read '%s'"), template_file);
Paolo Bonzini8089c852008-02-05 08:04:18 +0100728 hook_arg1 = "template";
Boris Faure8b1ae672011-05-08 12:31:02 +0200729 clean_message_contents = 0;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500730 }
731
Paolo Bonzini8089c852008-02-05 08:04:18 +0100732 /*
Jay Soffian37f7a852011-02-19 23:12:29 -0500733 * The remaining cases don't modify the template message, but
734 * just set the argument(s) to the prepare-commit-msg hook.
Paolo Bonzini8089c852008-02-05 08:04:18 +0100735 */
Jay Soffian37f7a852011-02-19 23:12:29 -0500736 else if (whence == FROM_MERGE)
Paolo Bonzini8089c852008-02-05 08:04:18 +0100737 hook_arg1 = "merge";
Jay Soffian37f7a852011-02-19 23:12:29 -0500738 else if (whence == FROM_CHERRY_PICK) {
739 hook_arg1 = "commit";
740 hook_arg2 = "CHERRY_PICK_HEAD";
741 }
Paolo Bonzini8089c852008-02-05 08:04:18 +0100742
Pat Notz89ac1222010-11-02 13:59:11 -0600743 if (squash_message) {
744 /*
745 * If squash_commit was used for the commit subject,
746 * then we're possibly hijacking other commit log options.
747 * Reset the hook args to tell the real story.
748 */
749 hook_arg1 = "message";
750 hook_arg2 = "";
751 }
752
Pranit Bauvae51b0df2016-05-25 00:49:50 +0530753 s->fp = fopen_for_writing(git_path_commit_editmsg());
Jonathan Nieder37f30122011-02-25 23:10:49 -0600754 if (s->fp == NULL)
Pranit Bauvae51b0df2016-05-25 00:49:50 +0530755 die_errno(_("could not open '%s'"), git_path_commit_editmsg());
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500756
Matthieu Moy2556b992013-09-06 19:43:07 +0200757 /* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
758 old_display_comment_prefix = s->display_comment_prefix;
759 s->display_comment_prefix = 1;
760
Matthieu Moyea9882b2013-09-12 12:50:06 +0200761 /*
762 * Most hints are counter-productive when the commit has
763 * already started.
764 */
765 s->hints = 0;
766
Boris Faure8b1ae672011-05-08 12:31:02 +0200767 if (clean_message_contents)
Tobias Klauser63af4a82015-10-16 17:16:42 +0200768 strbuf_stripspace(&sb, 0);
Johannes Schindelin13208572007-11-11 17:35:58 +0000769
Junio C Hamano073bd752014-10-28 12:44:09 -0700770 if (signoff)
Jonathan Tan710714a2016-11-02 10:29:17 -0700771 append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0);
Johannes Schindelin13208572007-11-11 17:35:58 +0000772
Jonathan Nieder37f30122011-02-25 23:10:49 -0600773 if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000774 die_errno(_("could not write commit template"));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500775
Nguyễn Thái Ngọc Duy84c9dc22014-05-17 08:52:23 +0700776 if (auto_comment_line_char)
777 adjust_comment_line_char(&sb);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500778 strbuf_release(&sb);
779
Santi Béjarbb1ae3f2008-05-04 18:04:51 +0200780 /* This checks if committer ident is explicitly given */
Jeff Kingf20f3872012-07-23 14:50:35 -0400781 strbuf_addstr(&committer_ident, git_committer_info(IDENT_STRICT));
James P. Howard, IIbed575e2009-12-07 17:45:27 -0500782 if (use_editor && include_status) {
Elia Pintoe23fd152014-01-30 07:15:56 -0800783 int ident_shown = 0;
784 int saved_color_setting;
Jeff King47010262014-05-01 21:06:57 -0400785 struct ident_split ci, ai;
786
Nguyễn Thái Ngọc Duy75df1f42014-02-17 19:15:32 +0700787 if (whence != FROM_COMMIT) {
Phillip Woodd0aaa462017-11-10 11:09:42 +0000788 if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
Nguyễn Thái Ngọc Duy75df1f42014-02-17 19:15:32 +0700789 wt_status_add_cut_line(s->fp);
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600790 status_printf_ln(s, GIT_COLOR_NORMAL,
Ævar Arnfjörð Bjarmasonb0cea472012-04-30 15:33:13 +0000791 whence == FROM_MERGE
792 ? _("\n"
793 "It looks like you may be committing a merge.\n"
794 "If this is not correct, please remove the file\n"
795 " %s\n"
796 "and try again.\n")
797 : _("\n"
798 "It looks like you may be committing a cherry-pick.\n"
799 "If this is not correct, please remove the file\n"
800 " %s\n"
801 "and try again.\n"),
Jeff Kingca03e062017-04-20 17:08:54 -0400802 whence == FROM_MERGE ?
803 git_path_merge_head() :
804 git_path_cherry_pick_head());
Nguyễn Thái Ngọc Duy75df1f42014-02-17 19:15:32 +0700805 }
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100806
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600807 fprintf(s->fp, "\n");
Phillip Woodd0aaa462017-11-10 11:09:42 +0000808 if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL)
Ævar Arnfjörð Bjarmason4064e662012-04-30 15:33:14 +0000809 status_printf(s, GIT_COLOR_NORMAL,
810 _("Please enter the commit message for your changes."
Junio C Hamanoeff80a92013-01-16 20:18:48 +0100811 " Lines starting\nwith '%c' will be ignored, and an empty"
812 " message aborts the commit.\n"), comment_line_char);
Phillip Woodd0aaa462017-11-10 11:09:42 +0000813 else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
814 whence == FROM_COMMIT)
Nguyễn Thái Ngọc Duy75df1f42014-02-17 19:15:32 +0700815 wt_status_add_cut_line(s->fp);
Phillip Woodd0aaa462017-11-10 11:09:42 +0000816 else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
Ævar Arnfjörð Bjarmason4064e662012-04-30 15:33:14 +0000817 status_printf(s, GIT_COLOR_NORMAL,
818 _("Please enter the commit message for your changes."
Junio C Hamanoeff80a92013-01-16 20:18:48 +0100819 " Lines starting\n"
820 "with '%c' will be kept; you may remove them"
821 " yourself if you want to.\n"
822 "An empty message aborts the commit.\n"), comment_line_char);
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100823
Jeff Kingfac90832014-12-10 10:42:10 -0500824 /*
825 * These should never fail because they come from our own
826 * fmt_ident. They may fail the sane_ident test, but we know
827 * that the name and mail pointers will at least be valid,
828 * which is enough for our tests and printing here.
829 */
830 assert_split_ident(&ai, author_ident);
831 assert_split_ident(&ci, &committer_ident);
Jeff King47010262014-05-01 21:06:57 -0400832
833 if (ident_cmp(&ai, &ci))
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600834 status_printf_ln(s, GIT_COLOR_NORMAL,
Ævar Arnfjörð Bjarmasonfe8165c2011-02-22 23:41:46 +0000835 _("%s"
Jeff King47010262014-05-01 21:06:57 -0400836 "Author: %.*s <%.*s>"),
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600837 ident_shown++ ? "" : "\n",
Jeff King47010262014-05-01 21:06:57 -0400838 (int)(ai.name_end - ai.name_begin), ai.name_begin,
839 (int)(ai.mail_end - ai.mail_begin), ai.mail_begin);
Santi Béjare83dbe82008-05-04 18:04:50 +0200840
Jeff Kingb7242b82014-05-01 21:10:01 -0400841 if (author_date_is_interesting())
842 status_printf_ln(s, GIT_COLOR_NORMAL,
843 _("%s"
844 "Date: %s"),
845 ident_shown++ ? "" : "\n",
Jeff Kinga5481a62015-06-25 12:55:02 -0400846 show_ident_date(&ai, DATE_MODE(NORMAL)));
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100847
Jeff Kingd6991ce2012-11-14 16:34:13 -0800848 if (!committer_ident_sufficiently_given())
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600849 status_printf_ln(s, GIT_COLOR_NORMAL,
Ævar Arnfjörð Bjarmasonfe8165c2011-02-22 23:41:46 +0000850 _("%s"
Jeff King47010262014-05-01 21:06:57 -0400851 "Committer: %.*s <%.*s>"),
Jonathan Niederb926c0d2011-02-25 23:11:37 -0600852 ident_shown++ ? "" : "\n",
Jeff King47010262014-05-01 21:06:57 -0400853 (int)(ci.name_end - ci.name_begin), ci.name_begin,
854 (int)(ci.mail_end - ci.mail_begin), ci.mail_begin);
Santi Béjarbb1ae3f2008-05-04 18:04:51 +0200855
Kaartic Sivaraamb3cf1b72017-06-30 17:42:21 +0530856 status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); /* Add new line for clarity */
Santi Béjarbb1ae3f2008-05-04 18:04:51 +0200857
Junio C Hamanod249b092009-08-09 21:59:30 -0700858 saved_color_setting = s->use_color;
859 s->use_color = 0;
Jonathan Nieder37f30122011-02-25 23:10:49 -0600860 commitable = run_status(s->fp, index_file, prefix, 1, s);
Junio C Hamanod249b092009-08-09 21:59:30 -0700861 s->use_color = saved_color_setting;
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100862 } else {
brian m. carlson8066df42017-02-20 00:10:14 +0000863 struct object_id oid;
Junio C Hamanofbcf1182007-12-19 19:23:03 -0800864 const char *parent = "HEAD";
Alex Riesen71686242007-11-28 22:13:08 +0100865
Alex Riesen71686242007-11-28 22:13:08 +0100866 if (!active_nr && read_cache() < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000867 die(_("Cannot read index"));
Alex Riesen71686242007-11-28 22:13:08 +0100868
Junio C Hamanofbcf1182007-12-19 19:23:03 -0800869 if (amend)
870 parent = "HEAD^1";
871
brian m. carlsone82caf32017-07-13 23:49:28 +0000872 if (get_oid(parent, &oid)) {
Nguyễn Thái Ngọc Duy2c49f7f2016-10-24 17:42:22 +0700873 int i, ita_nr = 0;
874
875 for (i = 0; i < active_nr; i++)
876 if (ce_intent_to_add(active_cache[i]))
877 ita_nr++;
878 commitable = active_nr - ita_nr > 0;
879 } else {
Jens Lehmannc215d3d2014-04-05 18:59:36 +0200880 /*
881 * Unless the user did explicitly request a submodule
882 * ignore mode by passing a command line option we do
883 * not ignore any changed submodule SHA-1s when
884 * comparing index and parent, no matter what is
885 * configured. Otherwise we won't commit any
886 * submodules which were manually staged, which would
887 * be really confusing.
888 */
Brandon Williams02f2f562017-10-31 11:19:05 -0700889 struct diff_flags flags = DIFF_FLAGS_INIT;
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700890 flags.override_submodule_config = 1;
Jens Lehmannc215d3d2014-04-05 18:59:36 +0200891 if (ignore_submodule_arg &&
892 !strcmp(ignore_submodule_arg, "all"))
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700893 flags.ignore_submodules = 1;
Brandon Williams02f2f562017-10-31 11:19:05 -0700894 commitable = index_differs_from(parent, &flags, 1);
Jens Lehmannc215d3d2014-04-05 18:59:36 +0200895 }
Alex Riesen71686242007-11-28 22:13:08 +0100896 }
Junio C Hamano4c28e4a2010-12-20 17:00:36 -0800897 strbuf_release(&committer_ident);
Alex Riesen71686242007-11-28 22:13:08 +0100898
Jonathan Nieder37f30122011-02-25 23:10:49 -0600899 fclose(s->fp);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500900
Jay Soffian37f7a852011-02-19 23:12:29 -0500901 /*
902 * Reject an attempt to record a non-merge empty commit without
903 * explicit --allow-empty. In the cherry-pick case, it may be
904 * empty due to conflict resolution, which the user should okay.
905 */
906 if (!commitable && whence != FROM_MERGE && !allow_empty &&
Junio C Hamano06bb6432011-08-19 11:58:18 -0700907 !(amend && is_a_merge(current_head))) {
Matthieu Moy2556b992013-09-06 19:43:07 +0200908 s->display_comment_prefix = old_display_comment_prefix;
Junio C Hamanod249b092009-08-09 21:59:30 -0700909 run_status(stdout, index_file, prefix, 0, s);
Jeff Kingf197ed22010-06-06 20:41:46 -0400910 if (amend)
Ævar Arnfjörð Bjarmasonfc88e312011-02-22 23:41:49 +0000911 fputs(_(empty_amend_advice), stderr);
Jeff Kingc17592a2013-07-26 19:39:28 -0400912 else if (whence == FROM_CHERRY_PICK) {
Junio C Hamano6c80cd22011-04-01 17:55:55 -0700913 fputs(_(empty_cherry_pick_advice), stderr);
Jeff Kingc17592a2013-07-26 19:39:28 -0400914 if (!sequencer_in_use)
915 fputs(_(empty_cherry_pick_advice_single), stderr);
916 else
917 fputs(_(empty_cherry_pick_advice_multi), stderr);
918 }
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100919 return 0;
920 }
921
Kevin Willford680ee552017-08-14 15:54:25 -0600922 if (!no_verify && find_hook("pre-commit")) {
923 /*
924 * Re-read the index as pre-commit hook could have updated it,
925 * and write it out as a tree. We must do this before we invoke
926 * the editor and after we invoke run_status above.
927 */
928 discard_cache();
929 }
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100930 read_cache_from(index_file);
Kevin Willford680ee552017-08-14 15:54:25 -0600931
Thomas Rast996277c2011-12-06 18:43:37 +0100932 if (update_main_cache_tree(0)) {
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000933 error(_("Error building trees"));
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100934 return 0;
935 }
936
Benoit Pierre15048f82014-03-18 11:00:53 +0100937 if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
Pranit Bauvae51b0df2016-05-25 00:49:50 +0530938 git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL))
Paolo Bonzini8089c852008-02-05 08:04:18 +0100939 return 0;
940
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100941 if (use_editor) {
Elia Pinto8d7aa4b2017-01-13 17:58:00 +0000942 struct argv_array env = ARGV_ARRAY_INIT;
943
944 argv_array_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
945 if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) {
Stephan Beyer71982032008-07-25 18:28:42 +0200946 fprintf(stderr,
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +0000947 _("Please supply the message using either -m or -F option.\n"));
Stephan Beyer71982032008-07-25 18:28:42 +0200948 exit(1);
949 }
Elia Pinto8d7aa4b2017-01-13 17:58:00 +0000950 argv_array_clear(&env);
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100951 }
952
953 if (!no_verify &&
Pranit Bauvae51b0df2016-05-25 00:49:50 +0530954 run_commit_hook(use_editor, index_file, "commit-msg", git_path_commit_editmsg(), NULL)) {
Paolo Bonziniec84bd02008-02-05 11:01:46 +0100955 return 0;
956 }
957
958 return 1;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -0500959}
960
Junio C Hamano146ea062008-08-26 23:13:13 -0700961static const char *find_author_by_nickname(const char *name)
962{
963 struct rev_info revs;
964 struct commit *commit;
965 struct strbuf buf = STRBUF_INIT;
Antoine Pelisseea167942013-08-23 15:48:31 +0200966 struct string_list mailmap = STRING_LIST_INIT_NODUP;
Junio C Hamano146ea062008-08-26 23:13:13 -0700967 const char *av[20];
968 int ac = 0;
969
970 init_revisions(&revs, NULL);
971 strbuf_addf(&buf, "--author=%s", name);
972 av[++ac] = "--all";
973 av[++ac] = "-i";
974 av[++ac] = buf.buf;
975 av[++ac] = NULL;
976 setup_revisions(ac, av, &revs, NULL);
Antoine Pelisseea167942013-08-23 15:48:31 +0200977 revs.mailmap = &mailmap;
978 read_mailmap(revs.mailmap, NULL);
979
Stefan Beller81c3ce32014-08-10 23:33:26 +0200980 if (prepare_revision_walk(&revs))
981 die(_("revision walk setup failed"));
Junio C Hamano146ea062008-08-26 23:13:13 -0700982 commit = get_revision(&revs);
983 if (commit) {
Thomas Rastdd2e7942009-10-19 17:48:08 +0200984 struct pretty_print_context ctx = {0};
Jeff Kinga5481a62015-06-25 12:55:02 -0400985 ctx.date_mode.type = DATE_NORMAL;
Junio C Hamano146ea062008-08-26 23:13:13 -0700986 strbuf_release(&buf);
Antoine Pelisseea167942013-08-23 15:48:31 +0200987 format_commit_message(commit, "%aN <%aE>", &buf, &ctx);
988 clear_mailmap(&mailmap);
Junio C Hamano146ea062008-08-26 23:13:13 -0700989 return strbuf_detach(&buf, NULL);
990 }
Michael J Gruber1044b1f2015-01-26 16:48:33 +0100991 die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
Junio C Hamano146ea062008-08-26 23:13:13 -0700992}
993
Jameson Millereec0f7f2017-10-30 13:21:37 -0400994static void handle_ignored_arg(struct wt_status *s)
995{
996 if (!ignored_arg)
997 ; /* default already initialized */
998 else if (!strcmp(ignored_arg, "traditional"))
999 s->show_ignored_mode = SHOW_TRADITIONAL_IGNORED;
1000 else if (!strcmp(ignored_arg, "no"))
1001 s->show_ignored_mode = SHOW_NO_IGNORED;
1002 else if (!strcmp(ignored_arg, "matching"))
1003 s->show_ignored_mode = SHOW_MATCHING_IGNORED;
1004 else
1005 die(_("Invalid ignored mode '%s'"), ignored_arg);
1006}
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001007
1008static void handle_untracked_files_arg(struct wt_status *s)
1009{
1010 if (!untracked_files_arg)
1011 ; /* default already initialized */
1012 else if (!strcmp(untracked_files_arg, "no"))
1013 s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
1014 else if (!strcmp(untracked_files_arg, "normal"))
1015 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
1016 else if (!strcmp(untracked_files_arg, "all"))
1017 s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
1018 else
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001019 die(_("Invalid untracked files mode '%s'"), untracked_files_arg);
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001020}
1021
Jay Soffian37f7a852011-02-19 23:12:29 -05001022static const char *read_commit_message(const char *name)
1023{
Jeff Kingdd0d3882013-01-26 04:44:06 -05001024 const char *out_enc;
Jay Soffian37f7a852011-02-19 23:12:29 -05001025 struct commit *commit;
1026
1027 commit = lookup_commit_reference_by_name(name);
1028 if (!commit)
Junio C Hamano6c80cd22011-04-01 17:55:55 -07001029 die(_("could not lookup commit %s"), name);
Jay Soffian37f7a852011-02-19 23:12:29 -05001030 out_enc = get_commit_output_encoding();
Nguyễn Thái Ngọc Duy5a10d232013-04-19 09:08:40 +10001031 return logmsg_reencode(commit, NULL, out_enc);
Jay Soffian37f7a852011-02-19 23:12:29 -05001032}
1033
Junio C Hamano84b42022013-06-24 11:41:40 -07001034/*
1035 * Enumerate what needs to be propagated when --porcelain
1036 * is not in effect here.
1037 */
1038static struct status_deferred_config {
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001039 enum wt_status_format status_format;
Junio C Hamano84b42022013-06-24 11:41:40 -07001040 int show_branch;
1041} status_deferred_config = {
1042 STATUS_FORMAT_UNSPECIFIED,
1043 -1 /* unspecified */
1044};
1045
1046static void finalize_deferred_config(struct wt_status *s)
1047{
1048 int use_deferred_config = (status_format != STATUS_FORMAT_PORCELAIN &&
Jeff Hostetler1ecdecc2016-08-11 10:45:57 -04001049 status_format != STATUS_FORMAT_PORCELAIN_V2 &&
Junio C Hamano84b42022013-06-24 11:41:40 -07001050 !s->null_termination);
1051
1052 if (s->null_termination) {
1053 if (status_format == STATUS_FORMAT_NONE ||
1054 status_format == STATUS_FORMAT_UNSPECIFIED)
1055 status_format = STATUS_FORMAT_PORCELAIN;
1056 else if (status_format == STATUS_FORMAT_LONG)
1057 die(_("--long and -z are incompatible"));
1058 }
1059
1060 if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)
1061 status_format = status_deferred_config.status_format;
1062 if (status_format == STATUS_FORMAT_UNSPECIFIED)
1063 status_format = STATUS_FORMAT_NONE;
1064
1065 if (use_deferred_config && s->show_branch < 0)
1066 s->show_branch = status_deferred_config.show_branch;
1067 if (s->show_branch < 0)
1068 s->show_branch = 0;
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00001069
1070 if (s->ahead_behind_flags == AHEAD_BEHIND_UNSPECIFIED)
1071 s->ahead_behind_flags = AHEAD_BEHIND_FULL;
Junio C Hamano84b42022013-06-24 11:41:40 -07001072}
1073
Shawn Bohrer2f02b252007-12-02 23:02:09 -06001074static int parse_and_validate_options(int argc, const char *argv[],
Jeff King036dbbf2012-05-07 15:18:26 -04001075 const struct option *options,
Junio C Hamanodbd0f5c2008-08-06 11:43:47 -07001076 const char * const usage[],
Junio C Hamanod249b092009-08-09 21:59:30 -07001077 const char *prefix,
Junio C Hamano06bb6432011-08-19 11:58:18 -07001078 struct commit *current_head,
Junio C Hamanod249b092009-08-09 21:59:30 -07001079 struct wt_status *s)
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001080{
1081 int f = 0;
1082
Jeff King036dbbf2012-05-07 15:18:26 -04001083 argc = parse_options(argc, argv, prefix, options, usage, 0);
Junio C Hamano84b42022013-06-24 11:41:40 -07001084 finalize_deferred_config(s);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001085
Junio C Hamano146ea062008-08-26 23:13:13 -07001086 if (force_author && !strchr(force_author, '>'))
1087 force_author = find_author_by_nickname(force_author);
1088
Erick Mattosc51f6ce2009-11-04 01:20:11 -02001089 if (force_author && renew_authorship)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001090 die(_("Using both --reset-author and --author does not make sense"));
Erick Mattosc51f6ce2009-11-04 01:20:11 -02001091
René Scharfe25206772013-05-25 23:43:34 +02001092 if (logfile || have_option_m || use_message || fixup_message)
Junio C Hamano48034662007-12-22 19:25:37 -08001093 use_editor = 0;
Junio C Hamanoca1ba202011-12-06 13:09:55 -08001094 if (0 <= edit_flag)
1095 use_editor = edit_flag;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001096
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001097 /* Sanity check options */
Junio C Hamano06bb6432011-08-19 11:58:18 -07001098 if (amend && !current_head)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001099 die(_("You have nothing to amend."));
Ævar Arnfjörð Bjarmasonb0cea472012-04-30 15:33:13 +00001100 if (amend && whence != FROM_COMMIT) {
1101 if (whence == FROM_MERGE)
1102 die(_("You are in the middle of a merge -- cannot amend."));
1103 else if (whence == FROM_CHERRY_PICK)
1104 die(_("You are in the middle of a cherry-pick -- cannot amend."));
1105 }
Pat Notz89ac1222010-11-02 13:59:11 -06001106 if (fixup_message && squash_message)
Ævar Arnfjörð Bjarmason9c227652011-02-22 23:41:45 +00001107 die(_("Options --squash and --fixup cannot be used together"));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001108 if (use_message)
1109 f++;
1110 if (edit_message)
1111 f++;
Pat Notzd71b8ba2010-11-02 13:59:09 -06001112 if (fixup_message)
1113 f++;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001114 if (logfile)
1115 f++;
1116 if (f > 1)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001117 die(_("Only one of -c/-C/-F/--fixup can be used."));
Ævar Arnfjörð Bjarmason30884c92017-12-22 20:41:52 +00001118 if (have_option_m && (edit_message || use_message || logfile))
1119 die((_("Option -m cannot be combined with -c/-C/-F.")));
Jeff King27014cb2016-04-07 12:56:26 -07001120 if (f || have_option_m)
Junio C Hamano010c7db2012-03-30 11:30:59 -07001121 template_file = NULL;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001122 if (edit_message)
1123 use_message = edit_message;
Pat Notzd71b8ba2010-11-02 13:59:09 -06001124 if (amend && !use_message && !fixup_message)
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001125 use_message = "HEAD";
Jay Soffian37f7a852011-02-19 23:12:29 -05001126 if (!use_message && whence != FROM_CHERRY_PICK && renew_authorship)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001127 die(_("--reset-author can be used only with -C, -c or --amend."));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001128 if (use_message) {
Jay Soffian37f7a852011-02-19 23:12:29 -05001129 use_message_buffer = read_commit_message(use_message);
1130 if (!renew_authorship) {
1131 author_message = use_message;
1132 author_message_buffer = use_message_buffer;
1133 }
1134 }
1135 if (whence == FROM_CHERRY_PICK && !renew_authorship) {
1136 author_message = "CHERRY_PICK_HEAD";
1137 author_message_buffer = read_commit_message(author_message);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001138 }
1139
Conrad Irwinb4bd4662011-05-07 10:58:07 -07001140 if (patch_interactive)
1141 interactive = 1;
1142
Stefan Beller05efb7b2013-08-07 09:32:25 +02001143 if (also + only + all + interactive > 1)
Conrad Irwinb4bd4662011-05-07 10:58:07 -07001144 die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
Andreas Krey319d8352016-12-02 23:15:13 +01001145 if (argc == 0 && (also || (only && !amend && !allow_empty)))
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001146 die(_("No paths with --include/--only does not make sense."));
Alex Riesen5f065732007-12-22 19:46:24 +01001147 if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
Phillip Woodd0aaa462017-11-10 11:09:42 +00001148 cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_ALL :
1149 COMMIT_MSG_CLEANUP_SPACE;
Alex Riesen5f065732007-12-22 19:46:24 +01001150 else if (!strcmp(cleanup_arg, "verbatim"))
Phillip Woodd0aaa462017-11-10 11:09:42 +00001151 cleanup_mode = COMMIT_MSG_CLEANUP_NONE;
Alex Riesen5f065732007-12-22 19:46:24 +01001152 else if (!strcmp(cleanup_arg, "whitespace"))
Phillip Woodd0aaa462017-11-10 11:09:42 +00001153 cleanup_mode = COMMIT_MSG_CLEANUP_SPACE;
Alex Riesen5f065732007-12-22 19:46:24 +01001154 else if (!strcmp(cleanup_arg, "strip"))
Phillip Woodd0aaa462017-11-10 11:09:42 +00001155 cleanup_mode = COMMIT_MSG_CLEANUP_ALL;
Nguyễn Thái Ngọc Duy75df1f42014-02-17 19:15:32 +07001156 else if (!strcmp(cleanup_arg, "scissors"))
Phillip Woodd0aaa462017-11-10 11:09:42 +00001157 cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_SCISSORS :
1158 COMMIT_MSG_CLEANUP_SPACE;
Alex Riesen5f065732007-12-22 19:46:24 +01001159 else
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001160 die(_("Invalid cleanup mode %s"), cleanup_arg);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001161
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001162 handle_untracked_files_arg(s);
Marius Storm-Olsen4bfee302008-06-05 10:31:19 +02001163
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001164 if (all && argc > 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001165 die(_("Paths with -a does not make sense."));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001166
Jeff Kingf3f47a12012-10-18 21:15:50 +07001167 if (status_format != STATUS_FORMAT_NONE)
Jeff King7c9f7032009-09-05 04:59:56 -04001168 dry_run = 1;
1169
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001170 return argc;
1171}
1172
Junio C Hamanod249b092009-08-09 21:59:30 -07001173static int dry_run_commit(int argc, const char **argv, const char *prefix,
Junio C Hamano06bb6432011-08-19 11:58:18 -07001174 const struct commit *current_head, struct wt_status *s)
Junio C Hamano3a5d13a2009-08-07 23:03:36 -07001175{
1176 int commitable;
1177 const char *index_file;
1178
Junio C Hamano06bb6432011-08-19 11:58:18 -07001179 index_file = prepare_index(argc, argv, prefix, current_head, 1);
Junio C Hamanod249b092009-08-09 21:59:30 -07001180 commitable = run_status(stdout, index_file, prefix, 0, s);
Junio C Hamano3a5d13a2009-08-07 23:03:36 -07001181 rollback_index_files();
1182
1183 return commitable ? 0 : 1;
1184}
1185
Jonathan Nieder88521172014-10-07 15:16:57 -04001186static int parse_status_slot(const char *slot)
Junio C Hamanof766b362009-08-09 23:12:19 -07001187{
Jonathan Nieder88521172014-10-07 15:16:57 -04001188 if (!strcasecmp(slot, "header"))
Junio C Hamanof766b362009-08-09 23:12:19 -07001189 return WT_STATUS_HEADER;
Jonathan Nieder88521172014-10-07 15:16:57 -04001190 if (!strcasecmp(slot, "branch"))
Aleksi Aalto1d282322010-11-18 01:40:05 +02001191 return WT_STATUS_ONBRANCH;
Jonathan Nieder88521172014-10-07 15:16:57 -04001192 if (!strcasecmp(slot, "updated") || !strcasecmp(slot, "added"))
Junio C Hamanof766b362009-08-09 23:12:19 -07001193 return WT_STATUS_UPDATED;
Jonathan Nieder88521172014-10-07 15:16:57 -04001194 if (!strcasecmp(slot, "changed"))
Junio C Hamanof766b362009-08-09 23:12:19 -07001195 return WT_STATUS_CHANGED;
Jonathan Nieder88521172014-10-07 15:16:57 -04001196 if (!strcasecmp(slot, "untracked"))
Junio C Hamanof766b362009-08-09 23:12:19 -07001197 return WT_STATUS_UNTRACKED;
Jonathan Nieder88521172014-10-07 15:16:57 -04001198 if (!strcasecmp(slot, "nobranch"))
Junio C Hamanof766b362009-08-09 23:12:19 -07001199 return WT_STATUS_NOBRANCH;
Jonathan Nieder88521172014-10-07 15:16:57 -04001200 if (!strcasecmp(slot, "unmerged"))
Junio C Hamanof766b362009-08-09 23:12:19 -07001201 return WT_STATUS_UNMERGED;
Stephen Kent93fdf302017-04-21 22:42:02 -07001202 if (!strcasecmp(slot, "localBranch"))
1203 return WT_STATUS_LOCAL_BRANCH;
1204 if (!strcasecmp(slot, "remoteBranch"))
1205 return WT_STATUS_REMOTE_BRANCH;
Jeff King8b8e8622009-12-12 07:25:24 -05001206 return -1;
Junio C Hamanof766b362009-08-09 23:12:19 -07001207}
1208
1209static int git_status_config(const char *k, const char *v, void *cb)
1210{
1211 struct wt_status *s = cb;
René Scharfee3f1da92014-10-04 20:54:50 +02001212 const char *slot_name;
Junio C Hamanof766b362009-08-09 23:12:19 -07001213
Christian Couder59556542013-11-30 21:55:40 +01001214 if (starts_with(k, "column."))
Jeff King4d2292e2012-05-07 15:35:03 -04001215 return git_column_config(k, v, "status", &s->colopts);
Junio C Hamanof766b362009-08-09 23:12:19 -07001216 if (!strcmp(k, "status.submodulesummary")) {
1217 int is_bool;
1218 s->submodule_summary = git_config_bool_or_int(k, v, &is_bool);
1219 if (is_bool && s->submodule_summary)
1220 s->submodule_summary = -1;
1221 return 0;
1222 }
Jorge Juan Garcia Garcia4fb51662013-06-11 15:34:04 +02001223 if (!strcmp(k, "status.short")) {
1224 if (git_config_bool(k, v))
Junio C Hamano84b42022013-06-24 11:41:40 -07001225 status_deferred_config.status_format = STATUS_FORMAT_SHORT;
Jorge Juan Garcia Garcia4fb51662013-06-11 15:34:04 +02001226 else
Junio C Hamano84b42022013-06-24 11:41:40 -07001227 status_deferred_config.status_format = STATUS_FORMAT_NONE;
Jorge Juan Garcia Garcia4fb51662013-06-11 15:34:04 +02001228 return 0;
1229 }
Jorge Juan Garcia Garciaec85d072013-06-11 15:34:05 +02001230 if (!strcmp(k, "status.branch")) {
Junio C Hamano84b42022013-06-24 11:41:40 -07001231 status_deferred_config.show_branch = git_config_bool(k, v);
Jorge Juan Garcia Garciaec85d072013-06-11 15:34:05 +02001232 return 0;
1233 }
Liam Beguinc1b5d012017-06-17 18:30:51 -04001234 if (!strcmp(k, "status.showstash")) {
1235 s->show_stash = git_config_bool(k, v);
1236 return 0;
1237 }
Junio C Hamanof766b362009-08-09 23:12:19 -07001238 if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
Jeff Kinge269eb72011-08-17 22:03:48 -07001239 s->use_color = git_config_colorbool(k, v);
Junio C Hamanof766b362009-08-09 23:12:19 -07001240 return 0;
1241 }
Matthieu Moy2556b992013-09-06 19:43:07 +02001242 if (!strcmp(k, "status.displaycommentprefix")) {
1243 s->display_comment_prefix = git_config_bool(k, v);
1244 return 0;
1245 }
René Scharfee3f1da92014-10-04 20:54:50 +02001246 if (skip_prefix(k, "status.color.", &slot_name) ||
1247 skip_prefix(k, "color.status.", &slot_name)) {
Junio C Hamanob9465762014-10-20 12:23:48 -07001248 int slot = parse_status_slot(slot_name);
Jeff King8b8e8622009-12-12 07:25:24 -05001249 if (slot < 0)
1250 return 0;
Junio C Hamanof766b362009-08-09 23:12:19 -07001251 if (!v)
1252 return config_error_nonbool(k);
Jeff Kingf6c5a292014-10-07 15:33:09 -04001253 return color_parse(v, s->color_palette[slot]);
Junio C Hamanof766b362009-08-09 23:12:19 -07001254 }
1255 if (!strcmp(k, "status.relativepaths")) {
1256 s->relative_paths = git_config_bool(k, v);
1257 return 0;
1258 }
1259 if (!strcmp(k, "status.showuntrackedfiles")) {
1260 if (!v)
1261 return config_error_nonbool(k);
1262 else if (!strcmp(v, "no"))
1263 s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;
1264 else if (!strcmp(v, "normal"))
1265 s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
1266 else if (!strcmp(v, "all"))
1267 s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
1268 else
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001269 return error(_("Invalid untracked files mode '%s'"), v);
Junio C Hamanof766b362009-08-09 23:12:19 -07001270 return 0;
1271 }
Ben Pearte8b2dc22018-05-11 15:38:58 +00001272 if (!strcmp(k, "diff.renamelimit")) {
1273 if (s->rename_limit == -1)
1274 s->rename_limit = git_config_int(k, v);
1275 return 0;
1276 }
1277 if (!strcmp(k, "status.renamelimit")) {
1278 s->rename_limit = git_config_int(k, v);
1279 return 0;
1280 }
1281 if (!strcmp(k, "diff.renames")) {
1282 if (s->detect_rename == -1)
1283 s->detect_rename = git_config_rename(k, v);
1284 return 0;
1285 }
1286 if (!strcmp(k, "status.renames")) {
1287 s->detect_rename = git_config_rename(k, v);
1288 return 0;
1289 }
Junio C Hamanof766b362009-08-09 23:12:19 -07001290 return git_diff_ui_config(k, v, NULL);
1291}
1292
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001293int cmd_status(int argc, const char **argv, const char *prefix)
1294{
Ben Pearte8b2dc22018-05-11 15:38:58 +00001295 static int no_renames = -1;
1296 static const char *rename_score_arg = (const char *)-1;
Jeff King036dbbf2012-05-07 15:18:26 -04001297 static struct wt_status s;
Markus Heidelberg4bb66442010-04-02 23:44:21 +02001298 int fd;
brian m. carlson8066df42017-02-20 00:10:14 +00001299 struct object_id oid;
Junio C Hamano9e4b7ab2009-08-15 02:27:39 -07001300 static struct option builtin_status_options[] = {
Nguyễn Thái Ngọc Duyf2276312012-08-20 19:32:37 +07001301 OPT__VERBOSE(&verbose, N_("be verbose")),
Jeff Kingdd2be242009-09-05 04:54:14 -04001302 OPT_SET_INT('s', "short", &status_format,
Nguyễn Thái Ngọc Duyf2276312012-08-20 19:32:37 +07001303 N_("show status concisely"), STATUS_FORMAT_SHORT),
Junio C Hamano84b42022013-06-24 11:41:40 -07001304 OPT_BOOL('b', "branch", &s.show_branch,
1305 N_("show branch information")),
Liam Beguinc1b5d012017-06-17 18:30:51 -04001306 OPT_BOOL(0, "show-stash", &s.show_stash,
1307 N_("show stash information")),
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00001308 OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
1309 N_("compute full ahead/behind values")),
Jeff Hostetlerc4f596b2016-08-05 18:00:28 -04001310 { OPTION_CALLBACK, 0, "porcelain", &status_format,
1311 N_("version"), N_("machine-readable output"),
1312 PARSE_OPT_OPTARG, opt_parse_porcelain },
Jeff Kingf3f47a12012-10-18 21:15:50 +07001313 OPT_SET_INT(0, "long", &status_format,
1314 N_("show status in long format (default)"),
1315 STATUS_FORMAT_LONG),
Stefan Bellerd5d09d42013-08-03 13:51:19 +02001316 OPT_BOOL('z', "null", &s.null_termination,
1317 N_("terminate entries with NUL")),
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001318 { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg,
Nguyễn Thái Ngọc Duyf2276312012-08-20 19:32:37 +07001319 N_("mode"),
1320 N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001321 PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
Jameson Millereec0f7f2017-10-30 13:21:37 -04001322 { OPTION_STRING, 0, "ignored", &ignored_arg,
1323 N_("mode"),
1324 N_("show ignored files, optional modes: traditional, matching, no. (Default: traditional)"),
1325 PARSE_OPT_OPTARG, NULL, (intptr_t)"traditional" },
Nguyễn Thái Ngọc Duyf2276312012-08-20 19:32:37 +07001326 { OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"),
1327 N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
Jens Lehmann46a958b2010-06-25 16:56:47 +02001328 PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001329 OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
Ben Pearte8b2dc22018-05-11 15:38:58 +00001330 OPT_BOOL(0, "no-renames", &no_renames, N_("do not detect renames")),
1331 { OPTION_CALLBACK, 'M', "find-renames", &rename_score_arg,
1332 N_("n"), N_("detect renames, optionally set similarity index"),
1333 PARSE_OPT_OPTARG, opt_parse_rename_score },
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001334 OPT_END(),
1335 };
1336
Nguyễn Thái Ngọc Duy5d3dd912010-10-22 01:45:47 -05001337 if (argc == 2 && !strcmp(argv[1], "-h"))
1338 usage_with_options(builtin_status_usage, builtin_status_options);
1339
Matthieu Moy5c25dfa2013-09-12 12:50:04 +02001340 status_init_config(&s, git_status_config);
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001341 argc = parse_options(argc, argv, prefix,
Junio C Hamano9e4b7ab2009-08-15 02:27:39 -07001342 builtin_status_options,
1343 builtin_status_usage, 0);
Jeff King4d2292e2012-05-07 15:35:03 -04001344 finalize_colopts(&s.colopts, -1);
Junio C Hamano84b42022013-06-24 11:41:40 -07001345 finalize_deferred_config(&s);
Junio C Hamano6c929722011-06-06 11:40:08 -07001346
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001347 handle_untracked_files_arg(&s);
Jameson Millereec0f7f2017-10-30 13:21:37 -04001348 handle_ignored_arg(&s);
1349
1350 if (s.show_ignored_mode == SHOW_MATCHING_IGNORED &&
1351 s.show_untracked_files == SHOW_NO_UNTRACKED_FILES)
1352 die(_("Unsupported combination of ignored and untracked-files arguments"));
1353
Nguyễn Thái Ngọc Duy15b55ae2013-07-14 15:35:39 +07001354 parse_pathspec(&s.pathspec, 0,
1355 PATHSPEC_PREFER_FULL,
1356 prefix, argv);
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001357
Nguyễn Thái Ngọc Duy5ab2a2d2013-07-14 15:35:49 +07001358 read_cache_preload(&s.pathspec);
Nguyễn Thái Ngọc Duy9b2d6142013-07-14 15:35:54 +07001359 refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
Markus Heidelberg4bb66442010-04-02 23:44:21 +02001360
Jeff King27344d62017-09-27 02:54:30 -04001361 if (use_optional_locks())
1362 fd = hold_locked_index(&index_lock, 0);
1363 else
1364 fd = -1;
Markus Heidelberg4bb66442010-04-02 23:44:21 +02001365
brian m. carlsone82caf32017-07-13 23:49:28 +00001366 s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04001367 if (!s.is_initial)
brian m. carlson8066df42017-02-20 00:10:14 +00001368 hashcpy(s.sha1_commit, oid.hash);
Jeff Hostetlerd9fc7462016-08-11 10:45:59 -04001369
Jens Lehmann46a958b2010-06-25 16:56:47 +02001370 s.ignore_submodule_arg = ignore_submodule_arg;
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001371 s.status_format = status_format;
1372 s.verbose = verbose;
Ben Pearte8b2dc22018-05-11 15:38:58 +00001373 if (no_renames != -1)
1374 s.detect_rename = !no_renames;
1375 if ((intptr_t)rename_score_arg != -1) {
1376 if (s.detect_rename < DIFF_DETECT_RENAME)
1377 s.detect_rename = DIFF_DETECT_RENAME;
1378 if (rename_score_arg)
1379 s.rename_score = parse_rename_score(&rename_score_arg);
1380 }
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001381
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001382 wt_status_collect(&s);
1383
Nguyễn Thái Ngọc Duy226c0512015-03-08 17:12:41 +07001384 if (0 <= fd)
1385 update_index_if_able(&the_index, &index_lock);
1386
Jeff King86617682009-12-07 00:26:25 -05001387 if (s.relative_paths)
1388 s.prefix = prefix;
Markus Heidelberg38920dd2009-01-08 19:53:05 +01001389
Jeff Hostetlerbe7e7952016-08-05 18:00:27 -04001390 wt_status_print(&s);
Junio C Hamano76e2f7c2009-08-07 23:31:57 -07001391 return 0;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001392}
1393
Stephan Beyer186458b2008-07-24 01:09:35 +02001394static int git_commit_config(const char *k, const char *v, void *cb)
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001395{
Junio C Hamanod249b092009-08-09 21:59:30 -07001396 struct wt_status *s = cb;
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001397 int status;
Junio C Hamanod249b092009-08-09 21:59:30 -07001398
Brian Hetro984c6e72008-07-05 01:24:40 -04001399 if (!strcmp(k, "commit.template"))
Matthieu Moy395de252009-11-17 18:24:25 +01001400 return git_config_pathname(&template_file, k, v);
James P. Howard, IIbed575e2009-12-07 17:45:27 -05001401 if (!strcmp(k, "commit.status")) {
1402 include_status = git_config_bool(k, v);
1403 return 0;
1404 }
Ralf Thielow51fb3a32013-01-10 18:45:59 +01001405 if (!strcmp(k, "commit.cleanup"))
1406 return git_config_string(&cleanup_arg, k, v);
Nicolas Vigierd95bfb12013-11-05 00:14:41 +01001407 if (!strcmp(k, "commit.gpgsign")) {
1408 sign_commit = git_config_bool(k, v) ? "" : NULL;
1409 return 0;
1410 }
Pranit Bauvaaaab8422016-05-05 15:20:02 +05301411 if (!strcmp(k, "commit.verbose")) {
1412 int is_bool;
1413 config_commit_verbose = git_config_bool_or_int(k, v, &is_bool);
1414 return 0;
1415 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001416
Junio C Hamanoba3c69a2011-10-05 17:23:20 -07001417 status = git_gpg_config(k, v, NULL);
1418 if (status)
1419 return status;
Junio C Hamanod249b092009-08-09 21:59:30 -07001420 return git_status_config(k, v, s);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001421}
1422
Benoit Pierre15048f82014-03-18 11:00:53 +01001423int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...)
1424{
Elia Pinto8d7aa4b2017-01-13 17:58:00 +00001425 struct argv_array hook_env = ARGV_ARRAY_INIT;
Benoit Pierre15048f82014-03-18 11:00:53 +01001426 va_list args;
1427 int ret;
1428
Elia Pinto8d7aa4b2017-01-13 17:58:00 +00001429 argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
Benoit Pierre15048f82014-03-18 11:00:53 +01001430
1431 /*
1432 * Let the hook know that no editor will be launched.
1433 */
1434 if (!editor_is_used)
Elia Pinto8d7aa4b2017-01-13 17:58:00 +00001435 argv_array_push(&hook_env, "GIT_EDITOR=:");
Benoit Pierre15048f82014-03-18 11:00:53 +01001436
1437 va_start(args, name);
Elia Pinto8d7aa4b2017-01-13 17:58:00 +00001438 ret = run_hook_ve(hook_env.argv,name, args);
Benoit Pierre15048f82014-03-18 11:00:53 +01001439 va_end(args);
Elia Pinto8d7aa4b2017-01-13 17:58:00 +00001440 argv_array_clear(&hook_env);
Benoit Pierre15048f82014-03-18 11:00:53 +01001441
1442 return ret;
1443}
1444
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001445int cmd_commit(int argc, const char **argv, const char *prefix)
1446{
Ævar Arnfjörð Bjarmason095c7412018-02-28 23:04:25 +00001447 const char *argv_gc_auto[] = {"gc", "--auto", NULL};
Jeff King036dbbf2012-05-07 15:18:26 -04001448 static struct wt_status s;
1449 static struct option builtin_commit_options[] = {
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001450 OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
1451 OPT__VERBOSE(&verbose, N_("show diff in commit message template")),
Jeff King036dbbf2012-05-07 15:18:26 -04001452
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001453 OPT_GROUP(N_("Commit message options")),
1454 OPT_FILENAME('F', "file", &logfile, N_("read message from file")),
1455 OPT_STRING(0, "author", &force_author, N_("author"), N_("override author for commit")),
1456 OPT_STRING(0, "date", &force_date, N_("date"), N_("override date for commit")),
1457 OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m),
1458 OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")),
1459 OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")),
1460 OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
1461 OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
Stefan Bellerd5d09d42013-08-03 13:51:19 +02001462 OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
1463 OPT_BOOL('s', "signoff", &signoff, N_("add Signed-off-by:")),
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001464 OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
1465 OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
1466 OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
Stefan Bellerd5d09d42013-08-03 13:51:19 +02001467 OPT_BOOL(0, "status", &include_status, N_("include status in commit message template")),
Junio C Hamanoe703d712014-03-23 15:58:12 -07001468 { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001469 N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
Jeff King036dbbf2012-05-07 15:18:26 -04001470 /* end commit message options */
1471
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001472 OPT_GROUP(N_("Commit contents options")),
Stefan Bellerd5d09d42013-08-03 13:51:19 +02001473 OPT_BOOL('a', "all", &all, N_("commit all changed files")),
1474 OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")),
1475 OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
1476 OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
1477 OPT_BOOL('o', "only", &only, N_("commit only specified files")),
Orgad Shanehdef480f2016-07-26 17:00:15 +03001478 OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
Stefan Bellerd5d09d42013-08-03 13:51:19 +02001479 OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001480 OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
Jeff King036dbbf2012-05-07 15:18:26 -04001481 STATUS_FORMAT_SHORT),
Junio C Hamano84b42022013-06-24 11:41:40 -07001482 OPT_BOOL(0, "branch", &s.show_branch, N_("show branch information")),
Jeff Hostetlerfd9b5442018-01-09 18:50:16 +00001483 OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
1484 N_("compute full ahead/behind values")),
Jeff King036dbbf2012-05-07 15:18:26 -04001485 OPT_SET_INT(0, "porcelain", &status_format,
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001486 N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
Jeff Kingf3f47a12012-10-18 21:15:50 +07001487 OPT_SET_INT(0, "long", &status_format,
1488 N_("show status in long format (default)"),
1489 STATUS_FORMAT_LONG),
Stefan Bellerd5d09d42013-08-03 13:51:19 +02001490 OPT_BOOL('z', "null", &s.null_termination,
1491 N_("terminate entries with NUL")),
1492 OPT_BOOL(0, "amend", &amend, N_("amend previous commit")),
1493 OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
Nguyễn Thái Ngọc Duy9c23f4c2012-08-20 19:32:04 +07001494 { 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" },
Jeff King036dbbf2012-05-07 15:18:26 -04001495 /* end commit contents options */
1496
Stefan Beller4741edd2013-08-03 13:51:18 +02001497 OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty,
1498 N_("ok to record an empty change")),
1499 OPT_HIDDEN_BOOL(0, "allow-empty-message", &allow_empty_message,
1500 N_("ok to record a change with an empty message")),
Jeff King036dbbf2012-05-07 15:18:26 -04001501
1502 OPT_END()
1503 };
1504
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001505 struct strbuf sb = STRBUF_INIT;
Junio C Hamano4c28e4a2010-12-20 17:00:36 -08001506 struct strbuf author_ident = STRBUF_INIT;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001507 const char *index_file, *reflog_msg;
brian m. carlson8066df42017-02-20 00:10:14 +00001508 struct object_id oid;
René Scharfede9f7fa2016-10-29 14:55:36 +02001509 struct commit_list *parents = NULL;
Miklos Vajnacf10f9f2008-10-03 14:04:47 +02001510 struct stat statbuf;
Junio C Hamano06bb6432011-08-19 11:58:18 -07001511 struct commit *current_head = NULL;
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001512 struct commit_extra_header *extra = NULL;
Ronnie Sahlbergc0fe1ed2014-04-16 15:34:19 -07001513 struct strbuf err = STRBUF_INIT;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001514
Nguyễn Thái Ngọc Duy5d3dd912010-10-22 01:45:47 -05001515 if (argc == 2 && !strcmp(argv[1], "-h"))
1516 usage_with_options(builtin_commit_usage, builtin_commit_options);
1517
Matthieu Moy5c25dfa2013-09-12 12:50:04 +02001518 status_init_config(&s, git_commit_config);
Kaartic Sivaraam4ddb1352017-06-21 23:46:14 +05301519 s.commit_template = 1;
Ramkumar Ramachandraf0915cb2013-06-24 18:15:12 +05301520 status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
Jeff King4d2292e2012-05-07 15:35:03 -04001521 s.colopts = 0;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001522
brian m. carlsone82caf32017-07-13 23:49:28 +00001523 if (get_oid("HEAD", &oid))
Junio C Hamano06bb6432011-08-19 11:58:18 -07001524 current_head = NULL;
1525 else {
brian m. carlsonbc832662017-05-06 22:10:10 +00001526 current_head = lookup_commit_or_die(&oid, "HEAD");
Jeff King5e7d4d32013-10-24 04:53:19 -04001527 if (parse_commit(current_head))
Junio C Hamano06bb6432011-08-19 11:58:18 -07001528 die(_("could not parse HEAD commit"));
1529 }
Pranit Bauvaaaab8422016-05-05 15:20:02 +05301530 verbose = -1; /* unspecified */
Jeff King036dbbf2012-05-07 15:18:26 -04001531 argc = parse_and_validate_options(argc, argv, builtin_commit_options,
1532 builtin_commit_usage,
Junio C Hamano06bb6432011-08-19 11:58:18 -07001533 prefix, current_head, &s);
Pranit Bauvaaaab8422016-05-05 15:20:02 +05301534 if (verbose == -1)
1535 verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
1536
Jeff Kingc9bfb952011-08-17 22:05:35 -07001537 if (dry_run)
Junio C Hamano06bb6432011-08-19 11:58:18 -07001538 return dry_run_commit(argc, argv, prefix, current_head, &s);
Junio C Hamano06bb6432011-08-19 11:58:18 -07001539 index_file = prepare_index(argc, argv, prefix, current_head, 0);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001540
Paolo Bonziniec84bd02008-02-05 11:01:46 +01001541 /* Set up everything for writing the commit object. This includes
1542 running hooks, writing the trees, and interacting with the user. */
Junio C Hamano06bb6432011-08-19 11:58:18 -07001543 if (!prepare_to_commit(index_file, prefix,
1544 current_head, &s, &author_ident)) {
Junio C Hamano28886052007-11-18 01:52:55 -08001545 rollback_index_files();
1546 return 1;
1547 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001548
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001549 /* Determine parents */
Christian Couder643cb5f2010-06-12 18:05:12 +02001550 reflog_msg = getenv("GIT_REFLOG_ACTION");
Junio C Hamano06bb6432011-08-19 11:58:18 -07001551 if (!current_head) {
Christian Couder643cb5f2010-06-12 18:05:12 +02001552 if (!reflog_msg)
1553 reflog_msg = "commit (initial)";
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001554 } else if (amend) {
Christian Couder643cb5f2010-06-12 18:05:12 +02001555 if (!reflog_msg)
1556 reflog_msg = "commit (amend)";
René Scharfede9f7fa2016-10-29 14:55:36 +02001557 parents = copy_commit_list(current_head->parents);
Jay Soffian37f7a852011-02-19 23:12:29 -05001558 } else if (whence == FROM_MERGE) {
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001559 struct strbuf m = STRBUF_INIT;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001560 FILE *fp;
Elia Pintoe23fd152014-01-30 07:15:56 -08001561 int allow_fast_forward = 1;
René Scharfede9f7fa2016-10-29 14:55:36 +02001562 struct commit_list **pptr = &parents;
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001563
Christian Couder643cb5f2010-06-12 18:05:12 +02001564 if (!reflog_msg)
1565 reflog_msg = "commit (merge)";
René Scharfede9f7fa2016-10-29 14:55:36 +02001566 pptr = commit_list_append(current_head, pptr);
Nguyễn Thái Ngọc Duy23a9e072017-05-03 17:16:46 +07001567 fp = xfopen(git_path_merge_head(), "r");
Junio C Hamano8f309ae2016-01-13 15:31:17 -08001568 while (strbuf_getline_lf(&m, fp) != EOF) {
Junio C Hamano5231c632011-11-07 16:21:32 -08001569 struct commit *parent;
1570
1571 parent = get_merge_parent(m.buf);
1572 if (!parent)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001573 die(_("Corrupt MERGE_HEAD file (%s)"), m.buf);
René Scharfede9f7fa2016-10-29 14:55:36 +02001574 pptr = commit_list_append(parent, pptr);
Linus Torvalds7c3fd252008-01-15 16:12:33 -08001575 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001576 fclose(fp);
1577 strbuf_release(&m);
Jeff Kingf9327292015-08-10 05:38:57 -04001578 if (!stat(git_path_merge_mode(), &statbuf)) {
1579 if (strbuf_read_file(&sb, git_path_merge_mode(), 0) < 0)
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001580 die_errno(_("could not read MERGE_MODE"));
Miklos Vajnacf10f9f2008-10-03 14:04:47 +02001581 if (!strcmp(sb.buf, "no-ff"))
1582 allow_fast_forward = 0;
1583 }
1584 if (allow_fast_forward)
Martin Ågren4da72642017-11-07 21:39:45 +01001585 reduce_heads_replace(&parents);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001586 } else {
Christian Couder643cb5f2010-06-12 18:05:12 +02001587 if (!reflog_msg)
Jay Soffian37f7a852011-02-19 23:12:29 -05001588 reflog_msg = (whence == FROM_CHERRY_PICK)
1589 ? "commit (cherry-pick)"
1590 : "commit";
René Scharfede9f7fa2016-10-29 14:55:36 +02001591 commit_list_insert(current_head, &parents);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001592 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001593
Paolo Bonziniec84bd02008-02-05 11:01:46 +01001594 /* Finally, get the commit message */
Miklos Vajnacf10f9f2008-10-03 14:04:47 +02001595 strbuf_reset(&sb);
Pranit Bauvae51b0df2016-05-25 00:49:50 +05301596 if (strbuf_read_file(&sb, git_path_commit_editmsg(), 0) < 0) {
Thomas Rast0721c312009-06-27 17:58:47 +02001597 int saved_errno = errno;
Junio C Hamano740001a2007-12-08 23:23:20 -08001598 rollback_index_files();
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001599 die(_("could not read commit message: %s"), strerror(saved_errno));
Junio C Hamano740001a2007-12-08 23:23:20 -08001600 }
Kristian Høgsberg99a12692007-11-21 21:54:49 -05001601
Nguyễn Thái Ngọc Duy75df1f42014-02-17 19:15:32 +07001602 if (verbose || /* Truncate the message just before the diff, if any. */
Phillip Woodd0aaa462017-11-10 11:09:42 +00001603 cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
Brian Malehornd76650b2017-05-15 23:06:49 -07001604 strbuf_setlen(&sb, wt_status_locate_end(sb.buf, sb.len));
Phillip Woodd0aaa462017-11-10 11:09:42 +00001605 if (cleanup_mode != COMMIT_MSG_CLEANUP_NONE)
1606 strbuf_stripspace(&sb, cleanup_mode == COMMIT_MSG_CLEANUP_ALL);
Kaartic Sivaraambc17f352017-07-17 21:06:15 +05301607
Phillip Woodd0aaa462017-11-10 11:09:42 +00001608 if (message_is_empty(&sb, cleanup_mode) && !allow_empty_message) {
Junio C Hamano28886052007-11-18 01:52:55 -08001609 rollback_index_files();
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001610 fprintf(stderr, _("Aborting commit due to empty commit message.\n"));
Jeff Kingfdc7c812008-07-31 03:36:09 -04001611 exit(1);
Junio C Hamano28886052007-11-18 01:52:55 -08001612 }
Phillip Woodd0aaa462017-11-10 11:09:42 +00001613 if (template_untouched(&sb, template_file, cleanup_mode) && !allow_empty_message) {
Kaartic Sivaraambc17f352017-07-17 21:06:15 +05301614 rollback_index_files();
1615 fprintf(stderr, _("Aborting commit; you did not edit the message.\n"));
1616 exit(1);
1617 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001618
Junio C Hamano0074d182011-12-20 13:20:56 -08001619 if (amend) {
Junio C Hamanoc871a1d2012-01-05 10:54:14 -08001620 const char *exclude_gpgsig[2] = { "gpgsig", NULL };
1621 extra = read_commit_extra_headers(current_head, exclude_gpgsig);
Junio C Hamano0074d182011-12-20 13:20:56 -08001622 } else {
1623 struct commit_extra_header **tail = &extra;
1624 append_merge_tag_headers(parents, &tail);
1625 }
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001626
Patryk Obara5078f342018-01-28 01:13:16 +01001627 if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
1628 parents, &oid, author_ident.buf, sign_commit,
1629 extra)) {
Junio C Hamano28886052007-11-18 01:52:55 -08001630 rollback_index_files();
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001631 die(_("failed to write commit object"));
Junio C Hamano28886052007-11-18 01:52:55 -08001632 }
Junio C Hamano4c28e4a2010-12-20 17:00:36 -08001633 strbuf_release(&author_ident);
Junio C Hamanoed7a42a2011-11-08 15:38:07 -08001634 free_commit_extra_headers(extra);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001635
Phillip Wood0505d602017-11-17 11:34:47 +00001636 if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb,
1637 &err)) {
Junio C Hamano28886052007-11-18 01:52:55 -08001638 rollback_index_files();
Ronnie Sahlbergc0fe1ed2014-04-16 15:34:19 -07001639 die("%s", err.buf);
Junio C Hamano28886052007-11-18 01:52:55 -08001640 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001641
Jeff Kingf9327292015-08-10 05:38:57 -04001642 unlink(git_path_cherry_pick_head());
1643 unlink(git_path_revert_head());
1644 unlink(git_path_merge_head());
1645 unlink(git_path_merge_msg());
1646 unlink(git_path_merge_mode());
1647 unlink(git_path_squash_msg());
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001648
Brandon Casey5a9dd392008-01-23 11:21:22 -06001649 if (commit_index_files())
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001650 die (_("Repository has been updated, but unable to write\n"
Alex Henriead5fe372014-08-30 13:56:01 -06001651 "new_index file. Check that disk is not full and quota is\n"
Ævar Arnfjörð Bjarmason8a6179b2011-02-22 23:41:44 +00001652 "not exceeded, and then \"git reset HEAD\" to recover."));
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001653
Junio C Hamanocb6020b2009-12-04 00:20:48 -08001654 rerere(0);
Ævar Arnfjörð Bjarmason095c7412018-02-28 23:04:25 +00001655 run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
Benoit Pierre15048f82014-03-18 11:00:53 +01001656 run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
Thomas Rast6f6bee32010-03-12 18:04:28 +01001657 if (amend && !no_post_rewrite) {
Phillip Wooda87a6f32017-11-17 11:34:48 +00001658 commit_post_rewrite(current_head, &oid);
Thomas Rast6f6bee32010-03-12 18:04:28 +01001659 }
Phillip Woode47c6ca2017-11-24 11:07:54 +00001660 if (!quiet) {
1661 unsigned int flags = 0;
1662
1663 if (!current_head)
1664 flags |= SUMMARY_INITIAL_COMMIT;
1665 if (author_date_is_interesting())
1666 flags |= SUMMARY_SHOW_AUTHOR_DATE;
1667 print_commit_summary(prefix, &oid, flags);
1668 }
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001669
Jeff King0e5bba52017-09-08 02:38:41 -04001670 UNLEAK(err);
1671 UNLEAK(sb);
Kristian Høgsbergf5bbc322007-11-08 11:59:00 -05001672 return 0;
1673}