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