]>
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" | |
9 | #include "cache-tree.h" | |
6b2f2d98 | 10 | #include "color.h" |
2888605c | 11 | #include "dir.h" |
f5bbc322 KH |
12 | #include "builtin.h" |
13 | #include "diff.h" | |
14 | #include "diffcore.h" | |
15 | #include "commit.h" | |
16 | #include "revision.h" | |
17 | #include "wt-status.h" | |
18 | #include "run-command.h" | |
19 | #include "refs.h" | |
20 | #include "log-tree.h" | |
21 | #include "strbuf.h" | |
22 | #include "utf8.h" | |
23 | #include "parse-options.h" | |
c455c87c | 24 | #include "string-list.h" |
5b2fd956 | 25 | #include "rerere.h" |
fa9dcf80 | 26 | #include "unpack-trees.h" |
76e2f7ce | 27 | #include "quote.h" |
302ad7a9 | 28 | #include "submodule.h" |
f5bbc322 KH |
29 | |
30 | static const char * const builtin_commit_usage[] = { | |
1b1dd23f | 31 | "git commit [options] [--] <filepattern>...", |
f5bbc322 KH |
32 | NULL |
33 | }; | |
34 | ||
2f02b25f | 35 | static const char * const builtin_status_usage[] = { |
1b1dd23f | 36 | "git status [options] [--] <filepattern>...", |
2f02b25f SB |
37 | NULL |
38 | }; | |
39 | ||
49ff9a7a JK |
40 | static const char implicit_ident_advice[] = |
41 | "Your name and email address were configured automatically based\n" | |
42 | "on your username and hostname. Please check that they are accurate.\n" | |
43 | "You can suppress this message by setting them explicitly:\n" | |
44 | "\n" | |
8bb45b25 | 45 | " git config --global user.name \"Your Name\"\n" |
49ff9a7a JK |
46 | " git config --global user.email you@example.com\n" |
47 | "\n" | |
48 | "If the identity used for this commit is wrong, you can fix it with:\n" | |
49 | "\n" | |
50 | " git commit --amend --author='Your Name <you@example.com>'\n"; | |
51 | ||
f197ed2f JK |
52 | static const char empty_amend_advice[] = |
53 | "You asked to amend the most recent commit, but doing so would make\n" | |
54 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
55 | "remove the commit entirely with \"git reset HEAD^\".\n"; | |
56 | ||
30988301 | 57 | static unsigned char head_sha1[20]; |
49ff9a7a | 58 | |
f5bbc322 KH |
59 | static char *use_message_buffer; |
60 | static const char commit_editmsg[] = "COMMIT_EDITMSG"; | |
2888605c JH |
61 | static struct lock_file index_lock; /* real index */ |
62 | static struct lock_file false_lock; /* used only for partial commits */ | |
63 | static enum { | |
64 | COMMIT_AS_IS = 1, | |
65 | COMMIT_NORMAL, | |
4b05548f | 66 | COMMIT_PARTIAL |
2888605c | 67 | } commit_style; |
f5bbc322 | 68 | |
dbd0f5c7 | 69 | static const char *logfile, *force_author; |
984c6e7e | 70 | static const char *template_file; |
f5bbc322 | 71 | static char *edit_message, *use_message; |
89ac1223 | 72 | static char *fixup_message, *squash_message; |
f5bbc322 | 73 | static int all, edit_flag, also, interactive, only, amend, signoff; |
c51f6cee | 74 | static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship; |
c9b5fde7 | 75 | static int no_post_rewrite, allow_empty_message; |
46a958b3 | 76 | static char *untracked_files_arg, *force_date, *ignore_submodule_arg; |
5f065737 AR |
77 | /* |
78 | * The default commit message cleanup mode will remove the lines | |
79 | * beginning with # (shell comments) and leading and trailing | |
80 | * whitespaces (empty lines or containing only whitespaces) | |
81 | * if editor is used, and only the whitespaces if the message | |
82 | * is specified explicitly. | |
83 | */ | |
84 | static enum { | |
85 | CLEANUP_SPACE, | |
86 | CLEANUP_NONE, | |
4b05548f | 87 | CLEANUP_ALL |
5f065737 AR |
88 | } cleanup_mode; |
89 | static char *cleanup_arg; | |
f5bbc322 | 90 | |
bed575e4 | 91 | static int use_editor = 1, initial_commit, in_merge, include_status = 1; |
2381e39e | 92 | static int show_ignored_in_status; |
3b6aeb3c JS |
93 | static const char *only_include_assumed; |
94 | static struct strbuf message; | |
f9568530 | 95 | |
7c9f7038 JK |
96 | static int null_termination; |
97 | static enum { | |
98 | STATUS_FORMAT_LONG, | |
99 | STATUS_FORMAT_SHORT, | |
4b05548f | 100 | STATUS_FORMAT_PORCELAIN |
7c9f7038 | 101 | } status_format = STATUS_FORMAT_LONG; |
05a59a08 | 102 | static int status_show_branch; |
7c9f7038 | 103 | |
f9568530 JS |
104 | static int opt_parse_m(const struct option *opt, const char *arg, int unset) |
105 | { | |
106 | struct strbuf *buf = opt->value; | |
107 | if (unset) | |
108 | strbuf_setlen(buf, 0); | |
109 | else { | |
110 | strbuf_addstr(buf, arg); | |
3b6aeb3c | 111 | strbuf_addstr(buf, "\n\n"); |
f9568530 JS |
112 | } |
113 | return 0; | |
114 | } | |
f5bbc322 KH |
115 | |
116 | static struct option builtin_commit_options[] = { | |
8c839683 JN |
117 | OPT__QUIET(&quiet, "suppress summary after successful commit"), |
118 | OPT__VERBOSE(&verbose, "show diff in commit message template"), | |
f5bbc322 | 119 | |
e97ca7f4 | 120 | OPT_GROUP("Commit message options"), |
df217ed6 | 121 | OPT_FILENAME('F', "file", &logfile, "read log from file"), |
f5bbc322 | 122 | OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"), |
02b47cd7 | 123 | OPT_STRING(0, "date", &force_date, "DATE", "override date for commit"), |
f9568530 | 124 | OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m), |
c51f6cee | 125 | OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"), |
f5bbc322 | 126 | OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"), |
d71b8ba7 | 127 | OPT_STRING(0, "fixup", &fixup_message, "COMMIT", "use autosquash formatted message to fixup specified commit"), |
89ac1223 | 128 | OPT_STRING(0, "squash", &squash_message, "COMMIT", "use autosquash formatted message to squash specified commit"), |
c51f6cee | 129 | OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"), |
362b0dd5 | 130 | OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), |
df217ed6 | 131 | OPT_FILENAME('t', "template", &template_file, "use specified template file"), |
f5bbc322 | 132 | OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"), |
e97ca7f4 | 133 | OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"), |
bed575e4 | 134 | OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"), |
e97ca7f4 | 135 | /* end commit message options */ |
f5bbc322 KH |
136 | |
137 | OPT_GROUP("Commit contents options"), | |
138 | OPT_BOOLEAN('a', "all", &all, "commit all changed files"), | |
139 | OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), | |
140 | OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), | |
d4ba07ca | 141 | OPT_BOOLEAN('o', "only", &only, "commit only specified files"), |
f5bbc322 | 142 | OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), |
3a5d13a3 | 143 | OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"), |
7c9f7038 JK |
144 | OPT_SET_INT(0, "short", &status_format, "show status concisely", |
145 | STATUS_FORMAT_SHORT), | |
05a59a08 | 146 | OPT_BOOLEAN(0, "branch", &status_show_branch, "show branch information"), |
7c9f7038 JK |
147 | OPT_SET_INT(0, "porcelain", &status_format, |
148 | "show porcelain output format", STATUS_FORMAT_PORCELAIN), | |
149 | OPT_BOOLEAN('z', "null", &null_termination, | |
150 | "terminate entries with NUL"), | |
f5bbc322 | 151 | OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), |
6f6bee3b | 152 | OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"), |
49bb1f2a | 153 | { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, |
e97ca7f4 | 154 | /* end commit contents options */ |
f5bbc322 | 155 | |
c9b5fde7 ÆAB |
156 | { OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL, |
157 | "ok to record an empty change", | |
158 | PARSE_OPT_NOARG | PARSE_OPT_HIDDEN }, | |
159 | { OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL, | |
160 | "ok to record a change with an empty message", | |
161 | PARSE_OPT_NOARG | PARSE_OPT_HIDDEN }, | |
162 | ||
f5bbc322 KH |
163 | OPT_END() |
164 | }; | |
165 | ||
2888605c JH |
166 | static void rollback_index_files(void) |
167 | { | |
168 | switch (commit_style) { | |
169 | case COMMIT_AS_IS: | |
170 | break; /* nothing to do */ | |
171 | case COMMIT_NORMAL: | |
172 | rollback_lock_file(&index_lock); | |
173 | break; | |
174 | case COMMIT_PARTIAL: | |
175 | rollback_lock_file(&index_lock); | |
176 | rollback_lock_file(&false_lock); | |
177 | break; | |
178 | } | |
179 | } | |
180 | ||
5a9dd399 | 181 | static int commit_index_files(void) |
2888605c | 182 | { |
5a9dd399 BC |
183 | int err = 0; |
184 | ||
2888605c JH |
185 | switch (commit_style) { |
186 | case COMMIT_AS_IS: | |
187 | break; /* nothing to do */ | |
188 | case COMMIT_NORMAL: | |
5a9dd399 | 189 | err = commit_lock_file(&index_lock); |
2888605c JH |
190 | break; |
191 | case COMMIT_PARTIAL: | |
5a9dd399 | 192 | err = commit_lock_file(&index_lock); |
2888605c JH |
193 | rollback_lock_file(&false_lock); |
194 | break; | |
195 | } | |
5a9dd399 BC |
196 | |
197 | return err; | |
2888605c JH |
198 | } |
199 | ||
200 | /* | |
201 | * Take a union of paths in the index and the named tree (typically, "HEAD"), | |
202 | * and return the paths that match the given pattern in list. | |
203 | */ | |
c455c87c | 204 | static int list_paths(struct string_list *list, const char *with_tree, |
2888605c JH |
205 | const char *prefix, const char **pattern) |
206 | { | |
207 | int i; | |
208 | char *m; | |
209 | ||
210 | for (i = 0; pattern[i]; i++) | |
211 | ; | |
212 | m = xcalloc(1, i); | |
213 | ||
214 | if (with_tree) | |
215 | overlay_tree_on_cache(with_tree, prefix); | |
216 | ||
217 | for (i = 0; i < active_nr; i++) { | |
218 | struct cache_entry *ce = active_cache[i]; | |
7fce6e3c NTND |
219 | struct string_list_item *item; |
220 | ||
7a51ed66 | 221 | if (ce->ce_flags & CE_UPDATE) |
e87e22d0 | 222 | continue; |
0b50922a | 223 | if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m)) |
2888605c | 224 | continue; |
78a395d3 | 225 | item = string_list_insert(list, ce->name); |
7fce6e3c NTND |
226 | if (ce_skip_worktree(ce)) |
227 | item->util = item; /* better a valid pointer than a fake one */ | |
2888605c JH |
228 | } |
229 | ||
230 | return report_path_error(m, pattern, prefix ? strlen(prefix) : 0); | |
231 | } | |
232 | ||
c455c87c | 233 | static void add_remove_files(struct string_list *list) |
2888605c JH |
234 | { |
235 | int i; | |
236 | for (i = 0; i < list->nr; i++) { | |
d177cab0 | 237 | struct stat st; |
c455c87c | 238 | struct string_list_item *p = &(list->items[i]); |
d177cab0 | 239 | |
7fce6e3c NTND |
240 | /* p->util is skip-worktree */ |
241 | if (p->util) | |
b4d1690d | 242 | continue; |
d177cab0 | 243 | |
c455c87c JS |
244 | if (!lstat(p->string, &st)) { |
245 | if (add_to_cache(p->string, &st, 0)) | |
960b8ad1 AR |
246 | die("updating files failed"); |
247 | } else | |
c455c87c | 248 | remove_file_from_cache(p->string); |
2888605c JH |
249 | } |
250 | } | |
251 | ||
fa9dcf80 LT |
252 | static void create_base_index(void) |
253 | { | |
254 | struct tree *tree; | |
255 | struct unpack_trees_options opts; | |
256 | struct tree_desc t; | |
257 | ||
258 | if (initial_commit) { | |
259 | discard_cache(); | |
260 | return; | |
261 | } | |
262 | ||
263 | memset(&opts, 0, sizeof(opts)); | |
264 | opts.head_idx = 1; | |
265 | opts.index_only = 1; | |
266 | opts.merge = 1; | |
34110cd4 LT |
267 | opts.src_index = &the_index; |
268 | opts.dst_index = &the_index; | |
fa9dcf80 LT |
269 | |
270 | opts.fn = oneway_merge; | |
271 | tree = parse_tree_indirect(head_sha1); | |
272 | if (!tree) | |
273 | die("failed to unpack HEAD tree object"); | |
274 | parse_tree(tree); | |
275 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
276 | if (unpack_trees(1, &t, &opts)) |
277 | exit(128); /* We've already reported the error, finish dying */ | |
fa9dcf80 LT |
278 | } |
279 | ||
d38a30df MM |
280 | static void refresh_cache_or_die(int refresh_flags) |
281 | { | |
282 | /* | |
283 | * refresh_flags contains REFRESH_QUIET, so the only errors | |
284 | * are for unmerged entries. | |
285 | */ | |
286 | if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN)) | |
287 | die_resolve_conflict("commit"); | |
288 | } | |
289 | ||
50b7e70f | 290 | static char *prepare_index(int argc, const char **argv, const char *prefix, int is_status) |
f5bbc322 KH |
291 | { |
292 | int fd; | |
c455c87c | 293 | struct string_list partial; |
2888605c | 294 | const char **pathspec = NULL; |
50b7e70f | 295 | int refresh_flags = REFRESH_QUIET; |
f5bbc322 | 296 | |
50b7e70f JH |
297 | if (is_status) |
298 | refresh_flags |= REFRESH_UNMERGED; | |
f5bbc322 | 299 | if (interactive) { |
4f6a32f8 JK |
300 | if (interactive_add(argc, argv, prefix) != 0) |
301 | die("interactive add failed"); | |
671c9b7e | 302 | if (read_cache_preload(NULL) < 0) |
d5350fd2 | 303 | die("index file corrupt"); |
2888605c | 304 | commit_style = COMMIT_AS_IS; |
f5bbc322 KH |
305 | return get_index_file(); |
306 | } | |
307 | ||
f64fe7b4 JH |
308 | if (*argv) |
309 | pathspec = get_pathspec(prefix, argv); | |
2888605c | 310 | |
671c9b7e LT |
311 | if (read_cache_preload(pathspec) < 0) |
312 | die("index file corrupt"); | |
313 | ||
2888605c JH |
314 | /* |
315 | * Non partial, non as-is commit. | |
316 | * | |
317 | * (1) get the real index; | |
318 | * (2) update the_index as necessary; | |
319 | * (3) write the_index out to the real index (still locked); | |
320 | * (4) return the name of the locked index file. | |
321 | * | |
322 | * The caller should run hooks on the locked real index, and | |
323 | * (A) if all goes well, commit the real index; | |
324 | * (B) on failure, rollback the real index. | |
325 | */ | |
326 | if (all || (also && pathspec && *pathspec)) { | |
1f2362a9 | 327 | fd = hold_locked_index(&index_lock, 1); |
7ae02a30 | 328 | add_files_to_cache(also ? prefix : NULL, pathspec, 0); |
d38a30df | 329 | refresh_cache_or_die(refresh_flags); |
4ed7cd3a BC |
330 | if (write_cache(fd, active_cache, active_nr) || |
331 | close_lock_file(&index_lock)) | |
f5bbc322 | 332 | die("unable to write new_index file"); |
2888605c JH |
333 | commit_style = COMMIT_NORMAL; |
334 | return index_lock.filename; | |
f5bbc322 KH |
335 | } |
336 | ||
2888605c JH |
337 | /* |
338 | * As-is commit. | |
339 | * | |
340 | * (1) return the name of the real index file. | |
341 | * | |
73276235 MH |
342 | * The caller should run hooks on the real index, |
343 | * and create commit from the_index. | |
2888605c JH |
344 | * We still need to refresh the index here. |
345 | */ | |
346 | if (!pathspec || !*pathspec) { | |
347 | fd = hold_locked_index(&index_lock, 1); | |
d38a30df | 348 | refresh_cache_or_die(refresh_flags); |
d5f5d0a9 JH |
349 | if (active_cache_changed) { |
350 | if (write_cache(fd, active_cache, active_nr) || | |
351 | commit_locked_index(&index_lock)) | |
352 | die("unable to write new_index file"); | |
353 | } else { | |
354 | rollback_lock_file(&index_lock); | |
355 | } | |
2888605c | 356 | commit_style = COMMIT_AS_IS; |
f5bbc322 KH |
357 | return get_index_file(); |
358 | } | |
359 | ||
2888605c JH |
360 | /* |
361 | * A partial commit. | |
362 | * | |
363 | * (0) find the set of affected paths; | |
364 | * (1) get lock on the real index file; | |
365 | * (2) update the_index with the given paths; | |
366 | * (3) write the_index out to the real index (still locked); | |
367 | * (4) get lock on the false index file; | |
368 | * (5) reset the_index from HEAD; | |
369 | * (6) update the_index the same way as (2); | |
370 | * (7) write the_index out to the false index file; | |
371 | * (8) return the name of the false index file (still locked); | |
372 | * | |
373 | * The caller should run hooks on the locked false index, and | |
374 | * create commit from it. Then | |
375 | * (A) if all goes well, commit the real index; | |
376 | * (B) on failure, rollback the real index; | |
377 | * In either case, rollback the false index. | |
378 | */ | |
379 | commit_style = COMMIT_PARTIAL; | |
380 | ||
30988301 | 381 | if (in_merge) |
2888605c JH |
382 | die("cannot do a partial commit during a merge."); |
383 | ||
384 | memset(&partial, 0, sizeof(partial)); | |
c455c87c | 385 | partial.strdup_strings = 1; |
2888605c JH |
386 | if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec)) |
387 | exit(1); | |
388 | ||
389 | discard_cache(); | |
390 | if (read_cache() < 0) | |
391 | die("cannot read the index"); | |
392 | ||
393 | fd = hold_locked_index(&index_lock, 1); | |
394 | add_remove_files(&partial); | |
ef12b50d | 395 | refresh_cache(REFRESH_QUIET); |
4ed7cd3a BC |
396 | if (write_cache(fd, active_cache, active_nr) || |
397 | close_lock_file(&index_lock)) | |
f5bbc322 KH |
398 | die("unable to write new_index file"); |
399 | ||
2888605c | 400 | fd = hold_lock_file_for_update(&false_lock, |
a157400c JH |
401 | git_path("next-index-%"PRIuMAX, |
402 | (uintmax_t) getpid()), | |
acd3b9ec | 403 | LOCK_DIE_ON_ERROR); |
fa9dcf80 LT |
404 | |
405 | create_base_index(); | |
2888605c | 406 | add_remove_files(&partial); |
d37d3203 | 407 | refresh_cache(REFRESH_QUIET); |
f5bbc322 | 408 | |
4ed7cd3a BC |
409 | if (write_cache(fd, active_cache, active_nr) || |
410 | close_lock_file(&false_lock)) | |
2888605c | 411 | die("unable to write temporary index file"); |
959ba670 JK |
412 | |
413 | discard_cache(); | |
414 | read_cache_from(false_lock.filename); | |
415 | ||
2888605c | 416 | return false_lock.filename; |
f5bbc322 KH |
417 | } |
418 | ||
d249b098 JH |
419 | static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn, |
420 | struct wt_status *s) | |
f5bbc322 | 421 | { |
76e2f7ce JH |
422 | unsigned char sha1[20]; |
423 | ||
d249b098 JH |
424 | if (s->relative_paths) |
425 | s->prefix = prefix; | |
f5bbc322 KH |
426 | |
427 | if (amend) { | |
d249b098 JH |
428 | s->amend = 1; |
429 | s->reference = "HEAD^1"; | |
f5bbc322 | 430 | } |
d249b098 JH |
431 | s->verbose = verbose; |
432 | s->index_file = index_file; | |
433 | s->fp = fp; | |
434 | s->nowarn = nowarn; | |
76e2f7ce | 435 | s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0; |
f5bbc322 | 436 | |
76e2f7ce | 437 | wt_status_collect(s); |
7c9f7038 JK |
438 | |
439 | switch (status_format) { | |
440 | case STATUS_FORMAT_SHORT: | |
05a59a08 | 441 | wt_shortstatus_print(s, null_termination, status_show_branch); |
7c9f7038 JK |
442 | break; |
443 | case STATUS_FORMAT_PORCELAIN: | |
4a7cc2fd | 444 | wt_porcelain_print(s, null_termination); |
7c9f7038 JK |
445 | break; |
446 | case STATUS_FORMAT_LONG: | |
447 | wt_status_print(s); | |
448 | break; | |
449 | } | |
f5bbc322 | 450 | |
d249b098 | 451 | return s->commitable; |
f5bbc322 KH |
452 | } |
453 | ||
ec84bd00 PB |
454 | static int is_a_merge(const unsigned char *sha1) |
455 | { | |
456 | struct commit *commit = lookup_commit(sha1); | |
457 | if (!commit || parse_commit(commit)) | |
458 | die("could not parse HEAD commit"); | |
459 | return !!(commit->parents && commit->parents->next); | |
460 | } | |
461 | ||
f5bbc322 KH |
462 | static const char sign_off_header[] = "Signed-off-by: "; |
463 | ||
4c28e4ad | 464 | static void determine_author_info(struct strbuf *author_ident) |
a45d46ba SB |
465 | { |
466 | char *name, *email, *date; | |
467 | ||
468 | name = getenv("GIT_AUTHOR_NAME"); | |
469 | email = getenv("GIT_AUTHOR_EMAIL"); | |
470 | date = getenv("GIT_AUTHOR_DATE"); | |
471 | ||
c51f6cee | 472 | if (use_message && !renew_authorship) { |
a45d46ba SB |
473 | const char *a, *lb, *rb, *eol; |
474 | ||
475 | a = strstr(use_message_buffer, "\nauthor "); | |
476 | if (!a) | |
477 | die("invalid commit: %s", use_message); | |
478 | ||
fb7749e4 JN |
479 | lb = strchrnul(a + strlen("\nauthor "), '<'); |
480 | rb = strchrnul(lb, '>'); | |
481 | eol = strchrnul(rb, '\n'); | |
482 | if (!*lb || !*rb || !*eol) | |
a45d46ba SB |
483 | die("invalid commit: %s", use_message); |
484 | ||
fb7749e4 JN |
485 | if (lb == a + strlen("\nauthor ")) |
486 | /* \nauthor <foo@example.com> */ | |
487 | name = xcalloc(1, 1); | |
488 | else | |
489 | name = xmemdupz(a + strlen("\nauthor "), | |
490 | (lb - strlen(" ") - | |
491 | (a + strlen("\nauthor ")))); | |
492 | email = xmemdupz(lb + strlen("<"), rb - (lb + strlen("<"))); | |
493 | date = xmemdupz(rb + strlen("> "), eol - (rb + strlen("> "))); | |
a45d46ba SB |
494 | } |
495 | ||
496 | if (force_author) { | |
497 | const char *lb = strstr(force_author, " <"); | |
498 | const char *rb = strchr(force_author, '>'); | |
499 | ||
500 | if (!lb || !rb) | |
501 | die("malformed --author parameter"); | |
502 | name = xstrndup(force_author, lb - force_author); | |
503 | email = xstrndup(lb + 2, rb - (lb + 2)); | |
504 | } | |
505 | ||
02b47cd7 MV |
506 | if (force_date) |
507 | date = force_date; | |
4c28e4ad JH |
508 | strbuf_addstr(author_ident, fmt_ident(name, email, date, |
509 | IDENT_ERROR_ON_NO_NAME)); | |
a45d46ba SB |
510 | } |
511 | ||
c1e01b0c DB |
512 | static int ends_rfc2822_footer(struct strbuf *sb) |
513 | { | |
514 | int ch; | |
515 | int hit = 0; | |
516 | int i, j, k; | |
517 | int len = sb->len; | |
518 | int first = 1; | |
519 | const char *buf = sb->buf; | |
520 | ||
521 | for (i = len - 1; i > 0; i--) { | |
522 | if (hit && buf[i] == '\n') | |
523 | break; | |
524 | hit = (buf[i] == '\n'); | |
525 | } | |
526 | ||
527 | while (i < len - 1 && buf[i] == '\n') | |
528 | i++; | |
529 | ||
530 | for (; i < len; i = k) { | |
531 | for (k = i; k < len && buf[k] != '\n'; k++) | |
532 | ; /* do nothing */ | |
533 | k++; | |
534 | ||
535 | if ((buf[k] == ' ' || buf[k] == '\t') && !first) | |
536 | continue; | |
537 | ||
538 | first = 0; | |
539 | ||
540 | for (j = 0; i + j < len; j++) { | |
541 | ch = buf[i + j]; | |
542 | if (ch == ':') | |
543 | break; | |
544 | if (isalnum(ch) || | |
545 | (ch == '-')) | |
546 | continue; | |
547 | return 0; | |
548 | } | |
549 | } | |
550 | return 1; | |
551 | } | |
552 | ||
4c28e4ad JH |
553 | static char *cut_ident_timestamp_part(char *string) |
554 | { | |
555 | char *ket = strrchr(string, '>'); | |
556 | if (!ket || ket[1] != ' ') | |
557 | die("Malformed ident string: '%s'", string); | |
558 | *++ket = '\0'; | |
559 | return ket; | |
560 | } | |
561 | ||
d249b098 | 562 | static int prepare_to_commit(const char *index_file, const char *prefix, |
4c28e4ad JH |
563 | struct wt_status *s, |
564 | struct strbuf *author_ident) | |
f5bbc322 KH |
565 | { |
566 | struct stat statbuf; | |
4c28e4ad | 567 | struct strbuf committer_ident = STRBUF_INIT; |
bc5d248a | 568 | int commitable, saved_color_setting; |
f285a2d7 | 569 | struct strbuf sb = STRBUF_INIT; |
f5bbc322 KH |
570 | char *buffer; |
571 | FILE *fp; | |
8089c85b PB |
572 | const char *hook_arg1 = NULL; |
573 | const char *hook_arg2 = NULL; | |
bb1ae3f6 | 574 | int ident_shown = 0; |
f5bbc322 | 575 | |
ec84bd00 PB |
576 | if (!no_verify && run_hook(index_file, "pre-commit", NULL)) |
577 | return 0; | |
f5bbc322 | 578 | |
89ac1223 PN |
579 | if (squash_message) { |
580 | /* | |
581 | * Insert the proper subject line before other commit | |
582 | * message options add their content. | |
583 | */ | |
584 | if (use_message && !strcmp(use_message, squash_message)) | |
585 | strbuf_addstr(&sb, "squash! "); | |
586 | else { | |
587 | struct pretty_print_context ctx = {0}; | |
588 | struct commit *c; | |
589 | c = lookup_commit_reference_by_name(squash_message); | |
590 | if (!c) | |
591 | die("could not lookup commit %s", squash_message); | |
592 | ctx.output_encoding = get_commit_output_encoding(); | |
593 | format_commit_message(c, "squash! %s\n\n", &sb, | |
594 | &ctx); | |
595 | } | |
596 | } | |
597 | ||
f9568530 JS |
598 | if (message.len) { |
599 | strbuf_addbuf(&sb, &message); | |
8089c85b | 600 | hook_arg1 = "message"; |
f5bbc322 KH |
601 | } else if (logfile && !strcmp(logfile, "-")) { |
602 | if (isatty(0)) | |
603 | fprintf(stderr, "(reading log message from standard input)\n"); | |
604 | if (strbuf_read(&sb, 0, 0) < 0) | |
0721c314 | 605 | die_errno("could not read log from standard input"); |
8089c85b | 606 | hook_arg1 = "message"; |
f5bbc322 KH |
607 | } else if (logfile) { |
608 | if (strbuf_read_file(&sb, logfile, 0) < 0) | |
d824cbba TR |
609 | die_errno("could not read log file '%s'", |
610 | logfile); | |
8089c85b | 611 | hook_arg1 = "message"; |
f5bbc322 KH |
612 | } else if (use_message) { |
613 | buffer = strstr(use_message_buffer, "\n\n"); | |
614 | if (!buffer || buffer[2] == '\0') | |
615 | die("commit has empty message"); | |
616 | strbuf_add(&sb, buffer + 2, strlen(buffer + 2)); | |
8089c85b PB |
617 | hook_arg1 = "commit"; |
618 | hook_arg2 = use_message; | |
d71b8ba7 PN |
619 | } else if (fixup_message) { |
620 | struct pretty_print_context ctx = {0}; | |
621 | struct commit *commit; | |
622 | commit = lookup_commit_reference_by_name(fixup_message); | |
623 | if (!commit) | |
624 | die("could not lookup commit %s", fixup_message); | |
625 | ctx.output_encoding = get_commit_output_encoding(); | |
626 | format_commit_message(commit, "fixup! %s\n\n", | |
627 | &sb, &ctx); | |
628 | hook_arg1 = "message"; | |
f5bbc322 KH |
629 | } else if (!stat(git_path("MERGE_MSG"), &statbuf)) { |
630 | if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0) | |
d824cbba | 631 | die_errno("could not read MERGE_MSG"); |
8089c85b | 632 | hook_arg1 = "merge"; |
f5bbc322 KH |
633 | } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) { |
634 | if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0) | |
d824cbba | 635 | die_errno("could not read SQUASH_MSG"); |
8089c85b | 636 | hook_arg1 = "squash"; |
f5bbc322 KH |
637 | } else if (template_file && !stat(template_file, &statbuf)) { |
638 | if (strbuf_read_file(&sb, template_file, 0) < 0) | |
d824cbba | 639 | die_errno("could not read '%s'", template_file); |
8089c85b | 640 | hook_arg1 = "template"; |
f5bbc322 KH |
641 | } |
642 | ||
8089c85b PB |
643 | /* |
644 | * This final case does not modify the template message, | |
645 | * it just sets the argument to the prepare-commit-msg hook. | |
646 | */ | |
647 | else if (in_merge) | |
648 | hook_arg1 = "merge"; | |
649 | ||
89ac1223 PN |
650 | if (squash_message) { |
651 | /* | |
652 | * If squash_commit was used for the commit subject, | |
653 | * then we're possibly hijacking other commit log options. | |
654 | * Reset the hook args to tell the real story. | |
655 | */ | |
656 | hook_arg1 = "message"; | |
657 | hook_arg2 = ""; | |
658 | } | |
659 | ||
f5bbc322 KH |
660 | fp = fopen(git_path(commit_editmsg), "w"); |
661 | if (fp == NULL) | |
d824cbba | 662 | die_errno("could not open '%s'", git_path(commit_editmsg)); |
f5bbc322 | 663 | |
5f065737 AR |
664 | if (cleanup_mode != CLEANUP_NONE) |
665 | stripspace(&sb, 0); | |
f5bbc322 KH |
666 | |
667 | if (signoff) { | |
f285a2d7 | 668 | struct strbuf sob = STRBUF_INIT; |
13208572 JS |
669 | int i; |
670 | ||
13208572 | 671 | strbuf_addstr(&sob, sign_off_header); |
d9ccfe77 JH |
672 | strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"), |
673 | getenv("GIT_COMMITTER_EMAIL"))); | |
13208572 | 674 | strbuf_addch(&sob, '\n'); |
13208572 JS |
675 | for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--) |
676 | ; /* do nothing */ | |
2150554b | 677 | if (prefixcmp(sb.buf + i, sob.buf)) { |
e5138436 | 678 | if (!i || !ends_rfc2822_footer(&sb)) |
2150554b | 679 | strbuf_addch(&sb, '\n'); |
13208572 | 680 | strbuf_addbuf(&sb, &sob); |
2150554b | 681 | } |
13208572 | 682 | strbuf_release(&sob); |
f5bbc322 KH |
683 | } |
684 | ||
13208572 | 685 | if (fwrite(sb.buf, 1, sb.len, fp) < sb.len) |
d824cbba | 686 | die_errno("could not write commit template"); |
13208572 | 687 | |
f5bbc322 KH |
688 | strbuf_release(&sb); |
689 | ||
4c28e4ad JH |
690 | /* This checks and barfs if author is badly specified */ |
691 | determine_author_info(author_ident); | |
e83dbe80 | 692 | |
bb1ae3f6 | 693 | /* This checks if committer ident is explicitly given */ |
4c28e4ad | 694 | strbuf_addstr(&committer_ident, git_committer_info(0)); |
bed575e4 | 695 | if (use_editor && include_status) { |
4c28e4ad | 696 | char *ai_tmp, *ci_tmp; |
ec84bd00 PB |
697 | if (in_merge) |
698 | fprintf(fp, | |
699 | "#\n" | |
700 | "# It looks like you may be committing a MERGE.\n" | |
701 | "# If this is not correct, please remove the file\n" | |
702 | "# %s\n" | |
703 | "# and try again.\n" | |
704 | "#\n", | |
705 | git_path("MERGE_HEAD")); | |
706 | ||
707 | fprintf(fp, | |
708 | "\n" | |
fdc7c811 | 709 | "# Please enter the commit message for your changes."); |
ec84bd00 | 710 | if (cleanup_mode == CLEANUP_ALL) |
fdc7c811 JK |
711 | fprintf(fp, |
712 | " Lines starting\n" | |
713 | "# with '#' will be ignored, and an empty" | |
714 | " message aborts the commit.\n"); | |
ec84bd00 | 715 | else /* CLEANUP_SPACE, that is. */ |
fdc7c811 JK |
716 | fprintf(fp, |
717 | " Lines starting\n" | |
718 | "# with '#' will be kept; you may remove them" | |
719 | " yourself if you want to.\n" | |
720 | "# An empty message aborts the commit.\n"); | |
ec84bd00 PB |
721 | if (only_include_assumed) |
722 | fprintf(fp, "# %s\n", only_include_assumed); | |
723 | ||
4c28e4ad JH |
724 | ai_tmp = cut_ident_timestamp_part(author_ident->buf); |
725 | ci_tmp = cut_ident_timestamp_part(committer_ident.buf); | |
726 | if (strcmp(author_ident->buf, committer_ident.buf)) | |
e83dbe80 | 727 | fprintf(fp, |
bb1ae3f6 SB |
728 | "%s" |
729 | "# Author: %s\n", | |
730 | ident_shown++ ? "" : "#\n", | |
4c28e4ad | 731 | author_ident->buf); |
e83dbe80 | 732 | |
5aeb3a3a | 733 | if (!user_ident_sufficiently_given()) |
bb1ae3f6 SB |
734 | fprintf(fp, |
735 | "%s" | |
736 | "# Committer: %s\n", | |
737 | ident_shown++ ? "" : "#\n", | |
4c28e4ad | 738 | committer_ident.buf); |
bb1ae3f6 SB |
739 | |
740 | if (ident_shown) | |
741 | fprintf(fp, "#\n"); | |
742 | ||
d249b098 JH |
743 | saved_color_setting = s->use_color; |
744 | s->use_color = 0; | |
745 | commitable = run_status(fp, index_file, prefix, 1, s); | |
746 | s->use_color = saved_color_setting; | |
4c28e4ad JH |
747 | |
748 | *ai_tmp = ' '; | |
749 | *ci_tmp = ' '; | |
ec84bd00 | 750 | } else { |
d616a239 | 751 | unsigned char sha1[20]; |
fbcf1184 | 752 | const char *parent = "HEAD"; |
7168624c | 753 | |
7168624c AR |
754 | if (!active_nr && read_cache() < 0) |
755 | die("Cannot read index"); | |
756 | ||
fbcf1184 JH |
757 | if (amend) |
758 | parent = "HEAD^1"; | |
759 | ||
d616a239 | 760 | if (get_sha1(parent, sha1)) |
ec84bd00 | 761 | commitable = !!active_nr; |
75f3ff2e SB |
762 | else |
763 | commitable = index_differs_from(parent, 0); | |
ec84bd00 | 764 | } |
4c28e4ad | 765 | strbuf_release(&committer_ident); |
d616a239 | 766 | |
ec84bd00 | 767 | fclose(fp); |
7168624c | 768 | |
ec84bd00 PB |
769 | if (!commitable && !in_merge && !allow_empty && |
770 | !(amend && is_a_merge(head_sha1))) { | |
d249b098 | 771 | run_status(stdout, index_file, prefix, 0, s); |
f197ed2f JK |
772 | if (amend) |
773 | fputs(empty_amend_advice, stderr); | |
ec84bd00 | 774 | return 0; |
7168624c AR |
775 | } |
776 | ||
ec84bd00 PB |
777 | /* |
778 | * Re-read the index as pre-commit hook could have updated it, | |
779 | * and write it out as a tree. We must do this before we invoke | |
780 | * the editor and after we invoke run_status above. | |
781 | */ | |
782 | discard_cache(); | |
783 | read_cache_from(index_file); | |
784 | if (!active_cache_tree) | |
785 | active_cache_tree = cache_tree(); | |
786 | if (cache_tree_update(active_cache_tree, | |
787 | active_cache, active_nr, 0, 0) < 0) { | |
331fcb59 | 788 | error("Error building trees"); |
ec84bd00 | 789 | return 0; |
7168624c | 790 | } |
f5bbc322 | 791 | |
8089c85b PB |
792 | if (run_hook(index_file, "prepare-commit-msg", |
793 | git_path(commit_editmsg), hook_arg1, hook_arg2, NULL)) | |
794 | return 0; | |
f5bbc322 | 795 | |
ec84bd00 PB |
796 | if (use_editor) { |
797 | char index[PATH_MAX]; | |
66dbfd55 GV |
798 | const char *env[2] = { NULL }; |
799 | env[0] = index; | |
ec84bd00 | 800 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file); |
7198203a SB |
801 | if (launch_editor(git_path(commit_editmsg), NULL, env)) { |
802 | fprintf(stderr, | |
803 | "Please supply the message using either -m or -F option.\n"); | |
804 | exit(1); | |
805 | } | |
ec84bd00 | 806 | } |
f5bbc322 | 807 | |
ec84bd00 PB |
808 | if (!no_verify && |
809 | run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) { | |
810 | return 0; | |
811 | } | |
f5bbc322 | 812 | |
ec84bd00 | 813 | return 1; |
f5bbc322 KH |
814 | } |
815 | ||
816 | /* | |
6bb6b034 MV |
817 | * Find out if the message in the strbuf contains only whitespace and |
818 | * Signed-off-by lines. | |
f5bbc322 | 819 | */ |
6bb6b034 | 820 | static int message_is_empty(struct strbuf *sb) |
f5bbc322 | 821 | { |
f285a2d7 | 822 | struct strbuf tmpl = STRBUF_INIT; |
f5bbc322 | 823 | const char *nl; |
6bb6b034 | 824 | int eol, i, start = 0; |
f5bbc322 | 825 | |
5f065737 AR |
826 | if (cleanup_mode == CLEANUP_NONE && sb->len) |
827 | return 0; | |
828 | ||
f5bbc322 | 829 | /* See if the template is just a prefix of the message. */ |
f5bbc322 | 830 | if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) { |
5f065737 | 831 | stripspace(&tmpl, cleanup_mode == CLEANUP_ALL); |
f5bbc322 KH |
832 | if (start + tmpl.len <= sb->len && |
833 | memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0) | |
834 | start += tmpl.len; | |
835 | } | |
836 | strbuf_release(&tmpl); | |
837 | ||
838 | /* Check if the rest is just whitespace and Signed-of-by's. */ | |
839 | for (i = start; i < sb->len; i++) { | |
840 | nl = memchr(sb->buf + i, '\n', sb->len - i); | |
841 | if (nl) | |
842 | eol = nl - sb->buf; | |
843 | else | |
844 | eol = sb->len; | |
845 | ||
846 | if (strlen(sign_off_header) <= eol - i && | |
847 | !prefixcmp(sb->buf + i, sign_off_header)) { | |
848 | i = eol; | |
849 | continue; | |
850 | } | |
851 | while (i < eol) | |
852 | if (!isspace(sb->buf[i++])) | |
853 | return 0; | |
854 | } | |
855 | ||
856 | return 1; | |
857 | } | |
858 | ||
146ea068 JH |
859 | static const char *find_author_by_nickname(const char *name) |
860 | { | |
861 | struct rev_info revs; | |
862 | struct commit *commit; | |
863 | struct strbuf buf = STRBUF_INIT; | |
864 | const char *av[20]; | |
865 | int ac = 0; | |
866 | ||
867 | init_revisions(&revs, NULL); | |
868 | strbuf_addf(&buf, "--author=%s", name); | |
869 | av[++ac] = "--all"; | |
870 | av[++ac] = "-i"; | |
871 | av[++ac] = buf.buf; | |
872 | av[++ac] = NULL; | |
873 | setup_revisions(ac, av, &revs, NULL); | |
874 | prepare_revision_walk(&revs); | |
875 | commit = get_revision(&revs); | |
876 | if (commit) { | |
dd2e794a TR |
877 | struct pretty_print_context ctx = {0}; |
878 | ctx.date_mode = DATE_NORMAL; | |
146ea068 | 879 | strbuf_release(&buf); |
dd2e794a | 880 | format_commit_message(commit, "%an <%ae>", &buf, &ctx); |
146ea068 JH |
881 | return strbuf_detach(&buf, NULL); |
882 | } | |
883 | die("No existing author found with '%s'", name); | |
884 | } | |
885 | ||
76e2f7ce JH |
886 | |
887 | static void handle_untracked_files_arg(struct wt_status *s) | |
888 | { | |
889 | if (!untracked_files_arg) | |
890 | ; /* default already initialized */ | |
891 | else if (!strcmp(untracked_files_arg, "no")) | |
892 | s->show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
893 | else if (!strcmp(untracked_files_arg, "normal")) | |
894 | s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
895 | else if (!strcmp(untracked_files_arg, "all")) | |
896 | s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
897 | else | |
898 | die("Invalid untracked files mode '%s'", untracked_files_arg); | |
899 | } | |
900 | ||
2f02b25f | 901 | static int parse_and_validate_options(int argc, const char *argv[], |
dbd0f5c7 | 902 | const char * const usage[], |
d249b098 JH |
903 | const char *prefix, |
904 | struct wt_status *s) | |
f5bbc322 KH |
905 | { |
906 | int f = 0; | |
907 | ||
37782920 SB |
908 | argc = parse_options(argc, argv, prefix, builtin_commit_options, usage, |
909 | 0); | |
f5bbc322 | 910 | |
146ea068 JH |
911 | if (force_author && !strchr(force_author, '>')) |
912 | force_author = find_author_by_nickname(force_author); | |
913 | ||
c51f6cee EM |
914 | if (force_author && renew_authorship) |
915 | die("Using both --reset-author and --author does not make sense"); | |
916 | ||
d71b8ba7 | 917 | if (logfile || message.len || use_message || fixup_message) |
4803466f | 918 | use_editor = 0; |
f5bbc322 | 919 | if (edit_flag) |
4803466f | 920 | use_editor = 1; |
406400ce PB |
921 | if (!use_editor) |
922 | setenv("GIT_EDITOR", ":", 1); | |
f5bbc322 KH |
923 | |
924 | if (get_sha1("HEAD", head_sha1)) | |
925 | initial_commit = 1; | |
926 | ||
f5bbc322 KH |
927 | /* Sanity check options */ |
928 | if (amend && initial_commit) | |
929 | die("You have nothing to amend."); | |
930 | if (amend && in_merge) | |
b5b644a9 | 931 | die("You are in the middle of a merge -- cannot amend."); |
89ac1223 PN |
932 | if (fixup_message && squash_message) |
933 | die("Options --squash and --fixup cannot be used together"); | |
f5bbc322 KH |
934 | if (use_message) |
935 | f++; | |
936 | if (edit_message) | |
937 | f++; | |
d71b8ba7 PN |
938 | if (fixup_message) |
939 | f++; | |
f5bbc322 KH |
940 | if (logfile) |
941 | f++; | |
942 | if (f > 1) | |
d71b8ba7 | 943 | die("Only one of -c/-C/-F/--fixup can be used."); |
f9568530 | 944 | if (message.len && f > 0) |
d71b8ba7 | 945 | die("Option -m cannot be combined with -c/-C/-F/--fixup."); |
f5bbc322 KH |
946 | if (edit_message) |
947 | use_message = edit_message; | |
d71b8ba7 | 948 | if (amend && !use_message && !fixup_message) |
f5bbc322 | 949 | use_message = "HEAD"; |
c51f6cee EM |
950 | if (!use_message && renew_authorship) |
951 | die("--reset-author can be used only with -C, -c or --amend."); | |
f5bbc322 | 952 | if (use_message) { |
f5bbc322 | 953 | const char *out_enc; |
f5bbc322 KH |
954 | struct commit *commit; |
955 | ||
a6fa5992 PN |
956 | commit = lookup_commit_reference_by_name(use_message); |
957 | if (!commit) | |
f5bbc322 | 958 | die("could not lookup commit %s", use_message); |
a6fa5992 PN |
959 | out_enc = get_commit_output_encoding(); |
960 | use_message_buffer = logmsg_reencode(commit, out_enc); | |
f5bbc322 KH |
961 | |
962 | /* | |
963 | * If we failed to reencode the buffer, just copy it | |
964 | * byte for byte so the user can try to fix it up. | |
965 | * This also handles the case where input and output | |
966 | * encodings are identical. | |
967 | */ | |
968 | if (use_message_buffer == NULL) | |
969 | use_message_buffer = xstrdup(commit->buffer); | |
f5bbc322 KH |
970 | } |
971 | ||
972 | if (!!also + !!only + !!all + !!interactive > 1) | |
973 | die("Only one of --include/--only/--all/--interactive can be used."); | |
974 | if (argc == 0 && (also || (only && !amend))) | |
975 | die("No paths with --include/--only does not make sense."); | |
976 | if (argc == 0 && only && amend) | |
977 | only_include_assumed = "Clever... amending the last one with dirty index."; | |
3c5283f8 | 978 | if (argc > 0 && !also && !only) |
f5bbc322 | 979 | only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths..."; |
5f065737 AR |
980 | if (!cleanup_arg || !strcmp(cleanup_arg, "default")) |
981 | cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; | |
982 | else if (!strcmp(cleanup_arg, "verbatim")) | |
983 | cleanup_mode = CLEANUP_NONE; | |
984 | else if (!strcmp(cleanup_arg, "whitespace")) | |
985 | cleanup_mode = CLEANUP_SPACE; | |
986 | else if (!strcmp(cleanup_arg, "strip")) | |
987 | cleanup_mode = CLEANUP_ALL; | |
988 | else | |
989 | die("Invalid cleanup mode %s", cleanup_arg); | |
f5bbc322 | 990 | |
76e2f7ce | 991 | handle_untracked_files_arg(s); |
4bfee30a | 992 | |
f5bbc322 KH |
993 | if (all && argc > 0) |
994 | die("Paths with -a does not make sense."); | |
995 | else if (interactive && argc > 0) | |
996 | die("Paths with --interactive does not make sense."); | |
997 | ||
7c9f7038 JK |
998 | if (null_termination && status_format == STATUS_FORMAT_LONG) |
999 | status_format = STATUS_FORMAT_PORCELAIN; | |
1000 | if (status_format != STATUS_FORMAT_LONG) | |
1001 | dry_run = 1; | |
1002 | ||
f5bbc322 KH |
1003 | return argc; |
1004 | } | |
1005 | ||
d249b098 JH |
1006 | static int dry_run_commit(int argc, const char **argv, const char *prefix, |
1007 | struct wt_status *s) | |
f5bbc322 | 1008 | { |
f5bbc322 | 1009 | int commitable; |
3a5d13a3 | 1010 | const char *index_file; |
f5bbc322 | 1011 | |
3a5d13a3 | 1012 | index_file = prepare_index(argc, argv, prefix, 1); |
d249b098 | 1013 | commitable = run_status(stdout, index_file, prefix, 0, s); |
3a5d13a3 | 1014 | rollback_index_files(); |
f5bbc322 | 1015 | |
3a5d13a3 JH |
1016 | return commitable ? 0 : 1; |
1017 | } | |
1018 | ||
f766b367 JH |
1019 | static int parse_status_slot(const char *var, int offset) |
1020 | { | |
1021 | if (!strcasecmp(var+offset, "header")) | |
1022 | return WT_STATUS_HEADER; | |
1d282327 AA |
1023 | if (!strcasecmp(var+offset, "branch")) |
1024 | return WT_STATUS_ONBRANCH; | |
f766b367 JH |
1025 | if (!strcasecmp(var+offset, "updated") |
1026 | || !strcasecmp(var+offset, "added")) | |
1027 | return WT_STATUS_UPDATED; | |
1028 | if (!strcasecmp(var+offset, "changed")) | |
1029 | return WT_STATUS_CHANGED; | |
1030 | if (!strcasecmp(var+offset, "untracked")) | |
1031 | return WT_STATUS_UNTRACKED; | |
1032 | if (!strcasecmp(var+offset, "nobranch")) | |
1033 | return WT_STATUS_NOBRANCH; | |
1034 | if (!strcasecmp(var+offset, "unmerged")) | |
1035 | return WT_STATUS_UNMERGED; | |
8b8e8624 | 1036 | return -1; |
f766b367 JH |
1037 | } |
1038 | ||
1039 | static int git_status_config(const char *k, const char *v, void *cb) | |
1040 | { | |
1041 | struct wt_status *s = cb; | |
1042 | ||
1043 | if (!strcmp(k, "status.submodulesummary")) { | |
1044 | int is_bool; | |
1045 | s->submodule_summary = git_config_bool_or_int(k, v, &is_bool); | |
1046 | if (is_bool && s->submodule_summary) | |
1047 | s->submodule_summary = -1; | |
1048 | return 0; | |
1049 | } | |
1050 | if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) { | |
1051 | s->use_color = git_config_colorbool(k, v, -1); | |
1052 | return 0; | |
1053 | } | |
1054 | if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) { | |
1055 | int slot = parse_status_slot(k, 13); | |
8b8e8624 JK |
1056 | if (slot < 0) |
1057 | return 0; | |
f766b367 JH |
1058 | if (!v) |
1059 | return config_error_nonbool(k); | |
1060 | color_parse(v, k, s->color_palette[slot]); | |
1061 | return 0; | |
1062 | } | |
1063 | if (!strcmp(k, "status.relativepaths")) { | |
1064 | s->relative_paths = git_config_bool(k, v); | |
1065 | return 0; | |
1066 | } | |
1067 | if (!strcmp(k, "status.showuntrackedfiles")) { | |
1068 | if (!v) | |
1069 | return config_error_nonbool(k); | |
1070 | else if (!strcmp(v, "no")) | |
1071 | s->show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
1072 | else if (!strcmp(v, "normal")) | |
1073 | s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
1074 | else if (!strcmp(v, "all")) | |
1075 | s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
1076 | else | |
1077 | return error("Invalid untracked files mode '%s'", v); | |
1078 | return 0; | |
1079 | } | |
1080 | return git_diff_ui_config(k, v, NULL); | |
1081 | } | |
1082 | ||
3a5d13a3 JH |
1083 | int cmd_status(int argc, const char **argv, const char *prefix) |
1084 | { | |
d249b098 | 1085 | struct wt_status s; |
4bb6644d | 1086 | int fd; |
76e2f7ce | 1087 | unsigned char sha1[20]; |
9e4b7ab6 | 1088 | static struct option builtin_status_options[] = { |
fd03881a | 1089 | OPT__VERBOSE(&verbose, "be verbose"), |
dd2be243 JK |
1090 | OPT_SET_INT('s', "short", &status_format, |
1091 | "show status concisely", STATUS_FORMAT_SHORT), | |
05a59a08 DKF |
1092 | OPT_BOOLEAN('b', "branch", &status_show_branch, |
1093 | "show branch information"), | |
6f157871 JK |
1094 | OPT_SET_INT(0, "porcelain", &status_format, |
1095 | "show porcelain output format", | |
1096 | STATUS_FORMAT_PORCELAIN), | |
173e6c88 JH |
1097 | OPT_BOOLEAN('z', "null", &null_termination, |
1098 | "terminate entries with NUL"), | |
76e2f7ce JH |
1099 | { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, |
1100 | "mode", | |
1101 | "show untracked files, optional modes: all, normal, no. (Default: all)", | |
1102 | PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, | |
2381e39e JH |
1103 | OPT_BOOLEAN(0, "ignored", &show_ignored_in_status, |
1104 | "show ignored files"), | |
46a958b3 JL |
1105 | { OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, "when", |
1106 | "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)", | |
1107 | PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, | |
76e2f7ce JH |
1108 | OPT_END(), |
1109 | }; | |
1110 | ||
5d3dd915 NTND |
1111 | if (argc == 2 && !strcmp(argv[1], "-h")) |
1112 | usage_with_options(builtin_status_usage, builtin_status_options); | |
1113 | ||
dd2be243 | 1114 | if (null_termination && status_format == STATUS_FORMAT_LONG) |
6f157871 | 1115 | status_format = STATUS_FORMAT_PORCELAIN; |
d249b098 JH |
1116 | |
1117 | wt_status_prepare(&s); | |
302ad7a9 | 1118 | gitmodules_config(); |
d249b098 | 1119 | git_config(git_status_config, &s); |
30988301 | 1120 | in_merge = file_exists(git_path("MERGE_HEAD")); |
76e2f7ce | 1121 | argc = parse_options(argc, argv, prefix, |
9e4b7ab6 JH |
1122 | builtin_status_options, |
1123 | builtin_status_usage, 0); | |
76e2f7ce | 1124 | handle_untracked_files_arg(&s); |
2381e39e JH |
1125 | if (show_ignored_in_status) |
1126 | s.show_ignored_files = 1; | |
76e2f7ce JH |
1127 | if (*argv) |
1128 | s.pathspec = get_pathspec(prefix, argv); | |
1129 | ||
149794dd | 1130 | read_cache_preload(s.pathspec); |
688cd6d2 | 1131 | refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL); |
4bb6644d MH |
1132 | |
1133 | fd = hold_locked_index(&index_lock, 0); | |
1134 | if (0 <= fd) { | |
d5f5d0a9 JH |
1135 | if (active_cache_changed && |
1136 | !write_cache(fd, active_cache, active_nr)) | |
4bb6644d | 1137 | commit_locked_index(&index_lock); |
d5f5d0a9 JH |
1138 | else |
1139 | rollback_lock_file(&index_lock); | |
4bb6644d MH |
1140 | } |
1141 | ||
76e2f7ce | 1142 | s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0; |
3c588453 | 1143 | s.in_merge = in_merge; |
46a958b3 | 1144 | s.ignore_submodule_arg = ignore_submodule_arg; |
76e2f7ce JH |
1145 | wt_status_collect(&s); |
1146 | ||
8661768f JK |
1147 | if (s.relative_paths) |
1148 | s.prefix = prefix; | |
d249b098 JH |
1149 | if (s.use_color == -1) |
1150 | s.use_color = git_use_color_default; | |
38920dd6 MH |
1151 | if (diff_use_color_default == -1) |
1152 | diff_use_color_default = git_use_color_default; | |
1153 | ||
dd2be243 JK |
1154 | switch (status_format) { |
1155 | case STATUS_FORMAT_SHORT: | |
05a59a08 | 1156 | wt_shortstatus_print(&s, null_termination, status_show_branch); |
dd2be243 | 1157 | break; |
6f157871 | 1158 | case STATUS_FORMAT_PORCELAIN: |
4a7cc2fd | 1159 | wt_porcelain_print(&s, null_termination); |
6f157871 | 1160 | break; |
dd2be243 | 1161 | case STATUS_FORMAT_LONG: |
173e6c88 | 1162 | s.verbose = verbose; |
46a958b3 | 1163 | s.ignore_submodule_arg = ignore_submodule_arg; |
173e6c88 | 1164 | wt_status_print(&s); |
dd2be243 | 1165 | break; |
173e6c88 | 1166 | } |
76e2f7ce | 1167 | return 0; |
f5bbc322 KH |
1168 | } |
1169 | ||
f5bbc322 KH |
1170 | static void print_summary(const char *prefix, const unsigned char *sha1) |
1171 | { | |
1172 | struct rev_info rev; | |
1173 | struct commit *commit; | |
49ff9a7a | 1174 | struct strbuf format = STRBUF_INIT; |
c85db254 JK |
1175 | unsigned char junk_sha1[20]; |
1176 | const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL); | |
49ff9a7a JK |
1177 | struct pretty_print_context pctx = {0}; |
1178 | struct strbuf author_ident = STRBUF_INIT; | |
1179 | struct strbuf committer_ident = STRBUF_INIT; | |
f5bbc322 KH |
1180 | |
1181 | commit = lookup_commit(sha1); | |
1182 | if (!commit) | |
b5b644a9 | 1183 | die("couldn't look up newly created commit"); |
f5bbc322 KH |
1184 | if (!commit || parse_commit(commit)) |
1185 | die("could not parse newly created commit"); | |
1186 | ||
49ff9a7a JK |
1187 | strbuf_addstr(&format, "format:%h] %s"); |
1188 | ||
1189 | format_commit_message(commit, "%an <%ae>", &author_ident, &pctx); | |
1190 | format_commit_message(commit, "%cn <%ce>", &committer_ident, &pctx); | |
1191 | if (strbuf_cmp(&author_ident, &committer_ident)) { | |
1192 | strbuf_addstr(&format, "\n Author: "); | |
1193 | strbuf_addbuf_percentquote(&format, &author_ident); | |
1194 | } | |
1a893064 | 1195 | if (!user_ident_sufficiently_given()) { |
49ff9a7a JK |
1196 | strbuf_addstr(&format, "\n Committer: "); |
1197 | strbuf_addbuf_percentquote(&format, &committer_ident); | |
b706fcfe JK |
1198 | if (advice_implicit_identity) { |
1199 | strbuf_addch(&format, '\n'); | |
1200 | strbuf_addstr(&format, implicit_ident_advice); | |
1201 | } | |
49ff9a7a JK |
1202 | } |
1203 | strbuf_release(&author_ident); | |
1204 | strbuf_release(&committer_ident); | |
1205 | ||
f5bbc322 KH |
1206 | init_revisions(&rev, prefix); |
1207 | setup_revisions(0, NULL, &rev, NULL); | |
1208 | ||
f5bbc322 KH |
1209 | rev.diff = 1; |
1210 | rev.diffopt.output_format = | |
1211 | DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY; | |
1212 | ||
1213 | rev.verbose_header = 1; | |
1214 | rev.show_root_diff = 1; | |
49ff9a7a | 1215 | get_commit_format(format.buf, &rev); |
bf82a150 | 1216 | rev.always_show_header = 0; |
3eb2a15e JH |
1217 | rev.diffopt.detect_rename = 1; |
1218 | rev.diffopt.rename_limit = 100; | |
1219 | rev.diffopt.break_opt = 0; | |
15964563 | 1220 | diff_setup_done(&rev.diffopt); |
f5bbc322 | 1221 | |
c5ee71fd | 1222 | printf("[%s%s ", |
c85db254 JK |
1223 | !prefixcmp(head, "refs/heads/") ? |
1224 | head + 11 : | |
1225 | !strcmp(head, "HEAD") ? | |
1226 | "detached HEAD" : | |
1227 | head, | |
1228 | initial_commit ? " (root-commit)" : ""); | |
f5bbc322 | 1229 | |
bf82a150 | 1230 | if (!log_tree_commit(&rev, commit)) { |
a45e1a87 TRC |
1231 | rev.always_show_header = 1; |
1232 | rev.use_terminator = 1; | |
1233 | log_tree_commit(&rev, commit); | |
bf82a150 | 1234 | } |
a45e1a87 | 1235 | |
fc6f19fe | 1236 | strbuf_release(&format); |
f5bbc322 KH |
1237 | } |
1238 | ||
186458b1 | 1239 | static int git_commit_config(const char *k, const char *v, void *cb) |
f5bbc322 | 1240 | { |
d249b098 JH |
1241 | struct wt_status *s = cb; |
1242 | ||
984c6e7e | 1243 | if (!strcmp(k, "commit.template")) |
395de250 | 1244 | return git_config_pathname(&template_file, k, v); |
bed575e4 JHI |
1245 | if (!strcmp(k, "commit.status")) { |
1246 | include_status = git_config_bool(k, v); | |
1247 | return 0; | |
1248 | } | |
f5bbc322 | 1249 | |
d249b098 | 1250 | return git_status_config(k, v, s); |
f5bbc322 KH |
1251 | } |
1252 | ||
6f6bee3b TR |
1253 | static const char post_rewrite_hook[] = "hooks/post-rewrite"; |
1254 | ||
1255 | static int run_rewrite_hook(const unsigned char *oldsha1, | |
1256 | const unsigned char *newsha1) | |
1257 | { | |
1258 | /* oldsha1 SP newsha1 LF NUL */ | |
1259 | static char buf[2*40 + 3]; | |
1260 | struct child_process proc; | |
1261 | const char *argv[3]; | |
1262 | int code; | |
1263 | size_t n; | |
1264 | ||
1265 | if (access(git_path(post_rewrite_hook), X_OK) < 0) | |
1266 | return 0; | |
1267 | ||
1268 | argv[0] = git_path(post_rewrite_hook); | |
1269 | argv[1] = "amend"; | |
1270 | argv[2] = NULL; | |
1271 | ||
1272 | memset(&proc, 0, sizeof(proc)); | |
1273 | proc.argv = argv; | |
1274 | proc.in = -1; | |
1275 | proc.stdout_to_stderr = 1; | |
1276 | ||
1277 | code = start_command(&proc); | |
1278 | if (code) | |
1279 | return code; | |
1280 | n = snprintf(buf, sizeof(buf), "%s %s\n", | |
1281 | sha1_to_hex(oldsha1), sha1_to_hex(newsha1)); | |
1282 | write_in_full(proc.in, buf, n); | |
1283 | close(proc.in); | |
1284 | return finish_command(&proc); | |
1285 | } | |
1286 | ||
f5bbc322 KH |
1287 | int cmd_commit(int argc, const char **argv, const char *prefix) |
1288 | { | |
f285a2d7 | 1289 | struct strbuf sb = STRBUF_INIT; |
4c28e4ad | 1290 | struct strbuf author_ident = STRBUF_INIT; |
f5bbc322 | 1291 | const char *index_file, *reflog_msg; |
99a12694 | 1292 | char *nl, *p; |
f5bbc322 KH |
1293 | unsigned char commit_sha1[20]; |
1294 | struct ref_lock *ref_lock; | |
6bb6b034 | 1295 | struct commit_list *parents = NULL, **pptr = &parents; |
cf10f9fd MV |
1296 | struct stat statbuf; |
1297 | int allow_fast_forward = 1; | |
d249b098 | 1298 | struct wt_status s; |
f5bbc322 | 1299 | |
5d3dd915 NTND |
1300 | if (argc == 2 && !strcmp(argv[1], "-h")) |
1301 | usage_with_options(builtin_commit_usage, builtin_commit_options); | |
1302 | ||
d249b098 JH |
1303 | wt_status_prepare(&s); |
1304 | git_config(git_commit_config, &s); | |
30988301 | 1305 | in_merge = file_exists(git_path("MERGE_HEAD")); |
3c588453 | 1306 | s.in_merge = in_merge; |
f5bbc322 | 1307 | |
d249b098 JH |
1308 | if (s.use_color == -1) |
1309 | s.use_color = git_use_color_default; | |
d249b098 JH |
1310 | argc = parse_and_validate_options(argc, argv, builtin_commit_usage, |
1311 | prefix, &s); | |
3fa509df JH |
1312 | if (dry_run) { |
1313 | if (diff_use_color_default == -1) | |
1314 | diff_use_color_default = git_use_color_default; | |
d249b098 | 1315 | return dry_run_commit(argc, argv, prefix, &s); |
3fa509df | 1316 | } |
50b7e70f | 1317 | index_file = prepare_index(argc, argv, prefix, 0); |
f5bbc322 | 1318 | |
ec84bd00 PB |
1319 | /* Set up everything for writing the commit object. This includes |
1320 | running hooks, writing the trees, and interacting with the user. */ | |
4c28e4ad | 1321 | if (!prepare_to_commit(index_file, prefix, &s, &author_ident)) { |
2888605c | 1322 | rollback_index_files(); |
f5bbc322 KH |
1323 | return 1; |
1324 | } | |
1325 | ||
f5bbc322 | 1326 | /* Determine parents */ |
643cb5f7 | 1327 | reflog_msg = getenv("GIT_REFLOG_ACTION"); |
f5bbc322 | 1328 | if (initial_commit) { |
643cb5f7 CC |
1329 | if (!reflog_msg) |
1330 | reflog_msg = "commit (initial)"; | |
f5bbc322 KH |
1331 | } else if (amend) { |
1332 | struct commit_list *c; | |
1333 | struct commit *commit; | |
1334 | ||
643cb5f7 CC |
1335 | if (!reflog_msg) |
1336 | reflog_msg = "commit (amend)"; | |
f5bbc322 KH |
1337 | commit = lookup_commit(head_sha1); |
1338 | if (!commit || parse_commit(commit)) | |
1339 | die("could not parse HEAD commit"); | |
1340 | ||
1341 | for (c = commit->parents; c; c = c->next) | |
6bb6b034 | 1342 | pptr = &commit_list_insert(c->item, pptr)->next; |
f5bbc322 | 1343 | } else if (in_merge) { |
f285a2d7 | 1344 | struct strbuf m = STRBUF_INIT; |
f5bbc322 KH |
1345 | FILE *fp; |
1346 | ||
643cb5f7 CC |
1347 | if (!reflog_msg) |
1348 | reflog_msg = "commit (merge)"; | |
6bb6b034 | 1349 | pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; |
f5bbc322 KH |
1350 | fp = fopen(git_path("MERGE_HEAD"), "r"); |
1351 | if (fp == NULL) | |
d824cbba TR |
1352 | die_errno("could not open '%s' for reading", |
1353 | git_path("MERGE_HEAD")); | |
7c3fd25d LT |
1354 | while (strbuf_getline(&m, fp, '\n') != EOF) { |
1355 | unsigned char sha1[20]; | |
1356 | if (get_sha1_hex(m.buf, sha1) < 0) | |
1357 | die("Corrupt MERGE_HEAD file (%s)", m.buf); | |
6bb6b034 | 1358 | pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next; |
7c3fd25d | 1359 | } |
f5bbc322 KH |
1360 | fclose(fp); |
1361 | strbuf_release(&m); | |
cf10f9fd MV |
1362 | if (!stat(git_path("MERGE_MODE"), &statbuf)) { |
1363 | if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0) | |
d824cbba | 1364 | die_errno("could not read MERGE_MODE"); |
cf10f9fd MV |
1365 | if (!strcmp(sb.buf, "no-ff")) |
1366 | allow_fast_forward = 0; | |
1367 | } | |
1368 | if (allow_fast_forward) | |
1369 | parents = reduce_heads(parents); | |
f5bbc322 | 1370 | } else { |
643cb5f7 CC |
1371 | if (!reflog_msg) |
1372 | reflog_msg = "commit"; | |
6bb6b034 | 1373 | pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; |
f5bbc322 | 1374 | } |
f5bbc322 | 1375 | |
ec84bd00 | 1376 | /* Finally, get the commit message */ |
cf10f9fd | 1377 | strbuf_reset(&sb); |
740001a5 | 1378 | if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) { |
0721c314 | 1379 | int saved_errno = errno; |
740001a5 | 1380 | rollback_index_files(); |
0721c314 | 1381 | die("could not read commit message: %s", strerror(saved_errno)); |
740001a5 | 1382 | } |
99a12694 KH |
1383 | |
1384 | /* Truncate the message just before the diff, if any. */ | |
0b38227f JK |
1385 | if (verbose) { |
1386 | p = strstr(sb.buf, "\ndiff --git "); | |
1387 | if (p != NULL) | |
1388 | strbuf_setlen(&sb, p - sb.buf + 1); | |
1389 | } | |
99a12694 | 1390 | |
5f065737 AR |
1391 | if (cleanup_mode != CLEANUP_NONE) |
1392 | stripspace(&sb, cleanup_mode == CLEANUP_ALL); | |
c9b5fde7 | 1393 | if (message_is_empty(&sb) && !allow_empty_message) { |
2888605c | 1394 | rollback_index_files(); |
fdc7c811 JK |
1395 | fprintf(stderr, "Aborting commit due to empty commit message.\n"); |
1396 | exit(1); | |
2888605c | 1397 | } |
f5bbc322 | 1398 | |
6bb6b034 | 1399 | if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1, |
4c28e4ad | 1400 | author_ident.buf)) { |
2888605c | 1401 | rollback_index_files(); |
f5bbc322 | 1402 | die("failed to write commit object"); |
2888605c | 1403 | } |
4c28e4ad | 1404 | strbuf_release(&author_ident); |
f5bbc322 KH |
1405 | |
1406 | ref_lock = lock_any_ref_for_update("HEAD", | |
1407 | initial_commit ? NULL : head_sha1, | |
1408 | 0); | |
1409 | ||
6bb6b034 | 1410 | nl = strchr(sb.buf, '\n'); |
741707b1 JS |
1411 | if (nl) |
1412 | strbuf_setlen(&sb, nl + 1 - sb.buf); | |
1413 | else | |
1414 | strbuf_addch(&sb, '\n'); | |
741707b1 JS |
1415 | strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg)); |
1416 | strbuf_insert(&sb, strlen(reflog_msg), ": ", 2); | |
f5bbc322 | 1417 | |
2888605c JH |
1418 | if (!ref_lock) { |
1419 | rollback_index_files(); | |
f5bbc322 | 1420 | die("cannot lock HEAD ref"); |
2888605c JH |
1421 | } |
1422 | if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) { | |
1423 | rollback_index_files(); | |
f5bbc322 | 1424 | die("cannot update HEAD ref"); |
2888605c | 1425 | } |
f5bbc322 KH |
1426 | |
1427 | unlink(git_path("MERGE_HEAD")); | |
1428 | unlink(git_path("MERGE_MSG")); | |
cf10f9fd | 1429 | unlink(git_path("MERGE_MODE")); |
5a95b855 | 1430 | unlink(git_path("SQUASH_MSG")); |
f5bbc322 | 1431 | |
5a9dd399 BC |
1432 | if (commit_index_files()) |
1433 | die ("Repository has been updated, but unable to write\n" | |
1434 | "new_index file. Check that disk is not full or quota is\n" | |
1435 | "not exceeded, and then \"git reset HEAD\" to recover."); | |
f5bbc322 | 1436 | |
cb6020bb | 1437 | rerere(0); |
2888605c | 1438 | run_hook(get_index_file(), "post-commit", NULL); |
6f6bee3b | 1439 | if (amend && !no_post_rewrite) { |
6360d343 TR |
1440 | struct notes_rewrite_cfg *cfg; |
1441 | cfg = init_copy_notes_for_rewrite("amend"); | |
1442 | if (cfg) { | |
1443 | copy_note_for_rewrite(cfg, head_sha1, commit_sha1); | |
1444 | finish_copy_notes_for_rewrite(cfg); | |
1445 | } | |
6f6bee3b TR |
1446 | run_rewrite_hook(head_sha1, commit_sha1); |
1447 | } | |
f5bbc322 KH |
1448 | if (!quiet) |
1449 | print_summary(prefix, commit_sha1); | |
1450 | ||
1451 | return 0; | |
1452 | } |