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