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