]>
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" |
f5bbc322 KH |
27 | |
28 | static const char * const builtin_commit_usage[] = { | |
1b1dd23f | 29 | "git commit [options] [--] <filepattern>...", |
f5bbc322 KH |
30 | NULL |
31 | }; | |
32 | ||
2f02b25f | 33 | static const char * const builtin_status_usage[] = { |
1b1dd23f | 34 | "git status [options] [--] <filepattern>...", |
2f02b25f SB |
35 | NULL |
36 | }; | |
37 | ||
f5bbc322 KH |
38 | static unsigned char head_sha1[20], merge_head_sha1[20]; |
39 | static char *use_message_buffer; | |
40 | static const char commit_editmsg[] = "COMMIT_EDITMSG"; | |
2888605c JH |
41 | static struct lock_file index_lock; /* real index */ |
42 | static struct lock_file false_lock; /* used only for partial commits */ | |
43 | static enum { | |
44 | COMMIT_AS_IS = 1, | |
45 | COMMIT_NORMAL, | |
46 | COMMIT_PARTIAL, | |
47 | } commit_style; | |
f5bbc322 | 48 | |
dbd0f5c7 | 49 | static const char *logfile, *force_author; |
984c6e7e | 50 | static const char *template_file; |
f5bbc322 | 51 | static char *edit_message, *use_message; |
e83dbe80 | 52 | static char *author_name, *author_email, *author_date; |
f5bbc322 | 53 | static int all, edit_flag, also, interactive, only, amend, signoff; |
4bfee30a MSO |
54 | static int quiet, verbose, no_verify, allow_empty; |
55 | static char *untracked_files_arg; | |
5f065737 AR |
56 | /* |
57 | * The default commit message cleanup mode will remove the lines | |
58 | * beginning with # (shell comments) and leading and trailing | |
59 | * whitespaces (empty lines or containing only whitespaces) | |
60 | * if editor is used, and only the whitespaces if the message | |
61 | * is specified explicitly. | |
62 | */ | |
63 | static enum { | |
64 | CLEANUP_SPACE, | |
65 | CLEANUP_NONE, | |
66 | CLEANUP_ALL, | |
67 | } cleanup_mode; | |
68 | static char *cleanup_arg; | |
f5bbc322 | 69 | |
4803466f | 70 | static int use_editor = 1, initial_commit, in_merge; |
3b6aeb3c JS |
71 | static const char *only_include_assumed; |
72 | static struct strbuf message; | |
f9568530 JS |
73 | |
74 | static int opt_parse_m(const struct option *opt, const char *arg, int unset) | |
75 | { | |
76 | struct strbuf *buf = opt->value; | |
77 | if (unset) | |
78 | strbuf_setlen(buf, 0); | |
79 | else { | |
80 | strbuf_addstr(buf, arg); | |
3b6aeb3c | 81 | strbuf_addstr(buf, "\n\n"); |
f9568530 JS |
82 | } |
83 | return 0; | |
84 | } | |
f5bbc322 KH |
85 | |
86 | static struct option builtin_commit_options[] = { | |
87 | OPT__QUIET(&quiet), | |
88 | OPT__VERBOSE(&verbose), | |
89 | OPT_GROUP("Commit message options"), | |
90 | ||
91 | OPT_STRING('F', "file", &logfile, "FILE", "read log from file"), | |
92 | OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"), | |
f9568530 | 93 | OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m), |
f5bbc322 KH |
94 | OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "), |
95 | OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"), | |
362b0dd5 | 96 | OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), |
f5bbc322 KH |
97 | OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"), |
98 | OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"), | |
99 | ||
100 | OPT_GROUP("Commit contents options"), | |
101 | OPT_BOOLEAN('a', "all", &all, "commit all changed files"), | |
102 | OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), | |
103 | OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), | |
d4ba07ca | 104 | OPT_BOOLEAN('o', "only", &only, "commit only specified files"), |
f5bbc322 KH |
105 | OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), |
106 | OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), | |
6c2ce048 | 107 | { 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" }, |
5241b6bf | 108 | OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"), |
5f065737 | 109 | OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"), |
f5bbc322 KH |
110 | |
111 | OPT_END() | |
112 | }; | |
113 | ||
2888605c JH |
114 | static void rollback_index_files(void) |
115 | { | |
116 | switch (commit_style) { | |
117 | case COMMIT_AS_IS: | |
118 | break; /* nothing to do */ | |
119 | case COMMIT_NORMAL: | |
120 | rollback_lock_file(&index_lock); | |
121 | break; | |
122 | case COMMIT_PARTIAL: | |
123 | rollback_lock_file(&index_lock); | |
124 | rollback_lock_file(&false_lock); | |
125 | break; | |
126 | } | |
127 | } | |
128 | ||
5a9dd399 | 129 | static int commit_index_files(void) |
2888605c | 130 | { |
5a9dd399 BC |
131 | int err = 0; |
132 | ||
2888605c JH |
133 | switch (commit_style) { |
134 | case COMMIT_AS_IS: | |
135 | break; /* nothing to do */ | |
136 | case COMMIT_NORMAL: | |
5a9dd399 | 137 | err = commit_lock_file(&index_lock); |
2888605c JH |
138 | break; |
139 | case COMMIT_PARTIAL: | |
5a9dd399 | 140 | err = commit_lock_file(&index_lock); |
2888605c JH |
141 | rollback_lock_file(&false_lock); |
142 | break; | |
143 | } | |
5a9dd399 BC |
144 | |
145 | return err; | |
2888605c JH |
146 | } |
147 | ||
148 | /* | |
149 | * Take a union of paths in the index and the named tree (typically, "HEAD"), | |
150 | * and return the paths that match the given pattern in list. | |
151 | */ | |
c455c87c | 152 | static int list_paths(struct string_list *list, const char *with_tree, |
2888605c JH |
153 | const char *prefix, const char **pattern) |
154 | { | |
155 | int i; | |
156 | char *m; | |
157 | ||
158 | for (i = 0; pattern[i]; i++) | |
159 | ; | |
160 | m = xcalloc(1, i); | |
161 | ||
162 | if (with_tree) | |
163 | overlay_tree_on_cache(with_tree, prefix); | |
164 | ||
165 | for (i = 0; i < active_nr; i++) { | |
166 | struct cache_entry *ce = active_cache[i]; | |
7a51ed66 | 167 | if (ce->ce_flags & CE_UPDATE) |
e87e22d0 | 168 | continue; |
2888605c JH |
169 | if (!pathspec_match(pattern, m, ce->name, 0)) |
170 | continue; | |
c455c87c | 171 | string_list_insert(ce->name, list); |
2888605c JH |
172 | } |
173 | ||
174 | return report_path_error(m, pattern, prefix ? strlen(prefix) : 0); | |
175 | } | |
176 | ||
c455c87c | 177 | static void add_remove_files(struct string_list *list) |
2888605c JH |
178 | { |
179 | int i; | |
180 | for (i = 0; i < list->nr; i++) { | |
d177cab0 | 181 | struct stat st; |
c455c87c | 182 | struct string_list_item *p = &(list->items[i]); |
d177cab0 | 183 | |
c455c87c JS |
184 | if (!lstat(p->string, &st)) { |
185 | if (add_to_cache(p->string, &st, 0)) | |
960b8ad1 AR |
186 | die("updating files failed"); |
187 | } else | |
c455c87c | 188 | remove_file_from_cache(p->string); |
2888605c JH |
189 | } |
190 | } | |
191 | ||
fa9dcf80 LT |
192 | static void create_base_index(void) |
193 | { | |
194 | struct tree *tree; | |
195 | struct unpack_trees_options opts; | |
196 | struct tree_desc t; | |
197 | ||
198 | if (initial_commit) { | |
199 | discard_cache(); | |
200 | return; | |
201 | } | |
202 | ||
203 | memset(&opts, 0, sizeof(opts)); | |
204 | opts.head_idx = 1; | |
205 | opts.index_only = 1; | |
206 | opts.merge = 1; | |
34110cd4 LT |
207 | opts.src_index = &the_index; |
208 | opts.dst_index = &the_index; | |
fa9dcf80 LT |
209 | |
210 | opts.fn = oneway_merge; | |
211 | tree = parse_tree_indirect(head_sha1); | |
212 | if (!tree) | |
213 | die("failed to unpack HEAD tree object"); | |
214 | parse_tree(tree); | |
215 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
216 | if (unpack_trees(1, &t, &opts)) |
217 | exit(128); /* We've already reported the error, finish dying */ | |
fa9dcf80 LT |
218 | } |
219 | ||
f64fe7b4 | 220 | static char *prepare_index(int argc, const char **argv, const char *prefix) |
f5bbc322 KH |
221 | { |
222 | int fd; | |
c455c87c | 223 | struct string_list partial; |
2888605c | 224 | const char **pathspec = NULL; |
f5bbc322 KH |
225 | |
226 | if (interactive) { | |
4f6a32f8 JK |
227 | if (interactive_add(argc, argv, prefix) != 0) |
228 | die("interactive add failed"); | |
671c9b7e | 229 | if (read_cache_preload(NULL) < 0) |
d5350fd2 | 230 | die("index file corrupt"); |
2888605c | 231 | commit_style = COMMIT_AS_IS; |
f5bbc322 KH |
232 | return get_index_file(); |
233 | } | |
234 | ||
f64fe7b4 JH |
235 | if (*argv) |
236 | pathspec = get_pathspec(prefix, argv); | |
2888605c | 237 | |
671c9b7e LT |
238 | if (read_cache_preload(pathspec) < 0) |
239 | die("index file corrupt"); | |
240 | ||
2888605c JH |
241 | /* |
242 | * Non partial, non as-is commit. | |
243 | * | |
244 | * (1) get the real index; | |
245 | * (2) update the_index as necessary; | |
246 | * (3) write the_index out to the real index (still locked); | |
247 | * (4) return the name of the locked index file. | |
248 | * | |
249 | * The caller should run hooks on the locked real index, and | |
250 | * (A) if all goes well, commit the real index; | |
251 | * (B) on failure, rollback the real index. | |
252 | */ | |
253 | if (all || (also && pathspec && *pathspec)) { | |
254 | int fd = hold_locked_index(&index_lock, 1); | |
7ae02a30 | 255 | add_files_to_cache(also ? prefix : NULL, pathspec, 0); |
d37d3203 | 256 | refresh_cache(REFRESH_QUIET); |
4ed7cd3a BC |
257 | if (write_cache(fd, active_cache, active_nr) || |
258 | close_lock_file(&index_lock)) | |
f5bbc322 | 259 | die("unable to write new_index file"); |
2888605c JH |
260 | commit_style = COMMIT_NORMAL; |
261 | return index_lock.filename; | |
f5bbc322 KH |
262 | } |
263 | ||
2888605c JH |
264 | /* |
265 | * As-is commit. | |
266 | * | |
267 | * (1) return the name of the real index file. | |
268 | * | |
269 | * The caller should run hooks on the real index, and run | |
270 | * hooks on the real index, and create commit from the_index. | |
271 | * We still need to refresh the index here. | |
272 | */ | |
273 | if (!pathspec || !*pathspec) { | |
274 | fd = hold_locked_index(&index_lock, 1); | |
275 | refresh_cache(REFRESH_QUIET); | |
276 | if (write_cache(fd, active_cache, active_nr) || | |
4439751d | 277 | commit_locked_index(&index_lock)) |
2888605c JH |
278 | die("unable to write new_index file"); |
279 | commit_style = COMMIT_AS_IS; | |
f5bbc322 KH |
280 | return get_index_file(); |
281 | } | |
282 | ||
2888605c JH |
283 | /* |
284 | * A partial commit. | |
285 | * | |
286 | * (0) find the set of affected paths; | |
287 | * (1) get lock on the real index file; | |
288 | * (2) update the_index with the given paths; | |
289 | * (3) write the_index out to the real index (still locked); | |
290 | * (4) get lock on the false index file; | |
291 | * (5) reset the_index from HEAD; | |
292 | * (6) update the_index the same way as (2); | |
293 | * (7) write the_index out to the false index file; | |
294 | * (8) return the name of the false index file (still locked); | |
295 | * | |
296 | * The caller should run hooks on the locked false index, and | |
297 | * create commit from it. Then | |
298 | * (A) if all goes well, commit the real index; | |
299 | * (B) on failure, rollback the real index; | |
300 | * In either case, rollback the false index. | |
301 | */ | |
302 | commit_style = COMMIT_PARTIAL; | |
303 | ||
304 | if (file_exists(git_path("MERGE_HEAD"))) | |
305 | die("cannot do a partial commit during a merge."); | |
306 | ||
307 | memset(&partial, 0, sizeof(partial)); | |
c455c87c | 308 | partial.strdup_strings = 1; |
2888605c JH |
309 | if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec)) |
310 | exit(1); | |
311 | ||
312 | discard_cache(); | |
313 | if (read_cache() < 0) | |
314 | die("cannot read the index"); | |
315 | ||
316 | fd = hold_locked_index(&index_lock, 1); | |
317 | add_remove_files(&partial); | |
ef12b50d | 318 | refresh_cache(REFRESH_QUIET); |
4ed7cd3a BC |
319 | if (write_cache(fd, active_cache, active_nr) || |
320 | close_lock_file(&index_lock)) | |
f5bbc322 KH |
321 | die("unable to write new_index file"); |
322 | ||
2888605c | 323 | fd = hold_lock_file_for_update(&false_lock, |
a157400c JH |
324 | git_path("next-index-%"PRIuMAX, |
325 | (uintmax_t) getpid()), | |
acd3b9ec | 326 | LOCK_DIE_ON_ERROR); |
fa9dcf80 LT |
327 | |
328 | create_base_index(); | |
2888605c | 329 | add_remove_files(&partial); |
d37d3203 | 330 | refresh_cache(REFRESH_QUIET); |
f5bbc322 | 331 | |
4ed7cd3a BC |
332 | if (write_cache(fd, active_cache, active_nr) || |
333 | close_lock_file(&false_lock)) | |
2888605c | 334 | die("unable to write temporary index file"); |
959ba670 JK |
335 | |
336 | discard_cache(); | |
337 | read_cache_from(false_lock.filename); | |
338 | ||
2888605c | 339 | return false_lock.filename; |
f5bbc322 KH |
340 | } |
341 | ||
37d07f8f | 342 | static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn) |
f5bbc322 KH |
343 | { |
344 | struct wt_status s; | |
345 | ||
346 | wt_status_prepare(&s); | |
46f721c8 JK |
347 | if (wt_status_relative_paths) |
348 | s.prefix = prefix; | |
f5bbc322 KH |
349 | |
350 | if (amend) { | |
351 | s.amend = 1; | |
352 | s.reference = "HEAD^1"; | |
353 | } | |
354 | s.verbose = verbose; | |
4bfee30a | 355 | s.untracked = (show_untracked_files == SHOW_ALL_UNTRACKED_FILES); |
f5bbc322 KH |
356 | s.index_file = index_file; |
357 | s.fp = fp; | |
37d07f8f | 358 | s.nowarn = nowarn; |
f5bbc322 KH |
359 | |
360 | wt_status_print(&s); | |
361 | ||
362 | return s.commitable; | |
363 | } | |
364 | ||
3473f303 PB |
365 | static int run_hook(const char *index_file, const char *name, ...) |
366 | { | |
367 | struct child_process hook; | |
368 | const char *argv[10], *env[2]; | |
369 | char index[PATH_MAX]; | |
370 | va_list args; | |
371 | int i; | |
372 | ||
373 | va_start(args, name); | |
374 | argv[0] = git_path("hooks/%s", name); | |
375 | i = 0; | |
376 | do { | |
377 | if (++i >= ARRAY_SIZE(argv)) | |
378 | die ("run_hook(): too many arguments"); | |
379 | argv[i] = va_arg(args, const char *); | |
380 | } while (argv[i]); | |
381 | va_end(args); | |
382 | ||
383 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file); | |
384 | env[0] = index; | |
385 | env[1] = NULL; | |
386 | ||
387 | if (access(argv[0], X_OK) < 0) | |
388 | return 0; | |
389 | ||
390 | memset(&hook, 0, sizeof(hook)); | |
391 | hook.argv = argv; | |
392 | hook.no_stdin = 1; | |
393 | hook.stdout_to_stderr = 1; | |
394 | hook.env = env; | |
395 | ||
396 | return run_command(&hook); | |
397 | } | |
398 | ||
ec84bd00 PB |
399 | static int is_a_merge(const unsigned char *sha1) |
400 | { | |
401 | struct commit *commit = lookup_commit(sha1); | |
402 | if (!commit || parse_commit(commit)) | |
403 | die("could not parse HEAD commit"); | |
404 | return !!(commit->parents && commit->parents->next); | |
405 | } | |
406 | ||
f5bbc322 KH |
407 | static const char sign_off_header[] = "Signed-off-by: "; |
408 | ||
e83dbe80 | 409 | static void determine_author_info(void) |
a45d46ba SB |
410 | { |
411 | char *name, *email, *date; | |
412 | ||
413 | name = getenv("GIT_AUTHOR_NAME"); | |
414 | email = getenv("GIT_AUTHOR_EMAIL"); | |
415 | date = getenv("GIT_AUTHOR_DATE"); | |
416 | ||
417 | if (use_message) { | |
418 | const char *a, *lb, *rb, *eol; | |
419 | ||
420 | a = strstr(use_message_buffer, "\nauthor "); | |
421 | if (!a) | |
422 | die("invalid commit: %s", use_message); | |
423 | ||
424 | lb = strstr(a + 8, " <"); | |
425 | rb = strstr(a + 8, "> "); | |
426 | eol = strchr(a + 8, '\n'); | |
427 | if (!lb || !rb || !eol) | |
428 | die("invalid commit: %s", use_message); | |
429 | ||
430 | name = xstrndup(a + 8, lb - (a + 8)); | |
431 | email = xstrndup(lb + 2, rb - (lb + 2)); | |
432 | date = xstrndup(rb + 2, eol - (rb + 2)); | |
433 | } | |
434 | ||
435 | if (force_author) { | |
436 | const char *lb = strstr(force_author, " <"); | |
437 | const char *rb = strchr(force_author, '>'); | |
438 | ||
439 | if (!lb || !rb) | |
440 | die("malformed --author parameter"); | |
441 | name = xstrndup(force_author, lb - force_author); | |
442 | email = xstrndup(lb + 2, rb - (lb + 2)); | |
443 | } | |
444 | ||
e83dbe80 SB |
445 | author_name = name; |
446 | author_email = email; | |
447 | author_date = date; | |
a45d46ba SB |
448 | } |
449 | ||
ec84bd00 | 450 | static int prepare_to_commit(const char *index_file, const char *prefix) |
f5bbc322 KH |
451 | { |
452 | struct stat statbuf; | |
bc5d248a | 453 | int commitable, saved_color_setting; |
f285a2d7 | 454 | struct strbuf sb = STRBUF_INIT; |
f5bbc322 KH |
455 | char *buffer; |
456 | FILE *fp; | |
8089c85b PB |
457 | const char *hook_arg1 = NULL; |
458 | const char *hook_arg2 = NULL; | |
bb1ae3f6 | 459 | int ident_shown = 0; |
f5bbc322 | 460 | |
ec84bd00 PB |
461 | if (!no_verify && run_hook(index_file, "pre-commit", NULL)) |
462 | return 0; | |
f5bbc322 | 463 | |
f9568530 JS |
464 | if (message.len) { |
465 | strbuf_addbuf(&sb, &message); | |
8089c85b | 466 | hook_arg1 = "message"; |
f5bbc322 KH |
467 | } else if (logfile && !strcmp(logfile, "-")) { |
468 | if (isatty(0)) | |
469 | fprintf(stderr, "(reading log message from standard input)\n"); | |
470 | if (strbuf_read(&sb, 0, 0) < 0) | |
471 | die("could not read log from standard input"); | |
8089c85b | 472 | hook_arg1 = "message"; |
f5bbc322 KH |
473 | } else if (logfile) { |
474 | if (strbuf_read_file(&sb, logfile, 0) < 0) | |
475 | die("could not read log file '%s': %s", | |
476 | logfile, strerror(errno)); | |
8089c85b | 477 | hook_arg1 = "message"; |
f5bbc322 KH |
478 | } else if (use_message) { |
479 | buffer = strstr(use_message_buffer, "\n\n"); | |
480 | if (!buffer || buffer[2] == '\0') | |
481 | die("commit has empty message"); | |
482 | strbuf_add(&sb, buffer + 2, strlen(buffer + 2)); | |
8089c85b PB |
483 | hook_arg1 = "commit"; |
484 | hook_arg2 = use_message; | |
f5bbc322 KH |
485 | } else if (!stat(git_path("MERGE_MSG"), &statbuf)) { |
486 | if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0) | |
487 | die("could not read MERGE_MSG: %s", strerror(errno)); | |
8089c85b | 488 | hook_arg1 = "merge"; |
f5bbc322 KH |
489 | } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) { |
490 | if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0) | |
491 | die("could not read SQUASH_MSG: %s", strerror(errno)); | |
8089c85b | 492 | hook_arg1 = "squash"; |
f5bbc322 KH |
493 | } else if (template_file && !stat(template_file, &statbuf)) { |
494 | if (strbuf_read_file(&sb, template_file, 0) < 0) | |
495 | die("could not read %s: %s", | |
496 | template_file, strerror(errno)); | |
8089c85b | 497 | hook_arg1 = "template"; |
f5bbc322 KH |
498 | } |
499 | ||
8089c85b PB |
500 | /* |
501 | * This final case does not modify the template message, | |
502 | * it just sets the argument to the prepare-commit-msg hook. | |
503 | */ | |
504 | else if (in_merge) | |
505 | hook_arg1 = "merge"; | |
506 | ||
f5bbc322 KH |
507 | fp = fopen(git_path(commit_editmsg), "w"); |
508 | if (fp == NULL) | |
cdeaf10f CP |
509 | die("could not open %s: %s", |
510 | git_path(commit_editmsg), strerror(errno)); | |
f5bbc322 | 511 | |
5f065737 AR |
512 | if (cleanup_mode != CLEANUP_NONE) |
513 | stripspace(&sb, 0); | |
f5bbc322 KH |
514 | |
515 | if (signoff) { | |
f285a2d7 | 516 | struct strbuf sob = STRBUF_INIT; |
13208572 JS |
517 | int i; |
518 | ||
13208572 | 519 | strbuf_addstr(&sob, sign_off_header); |
d9ccfe77 JH |
520 | strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"), |
521 | getenv("GIT_COMMITTER_EMAIL"))); | |
13208572 | 522 | strbuf_addch(&sob, '\n'); |
13208572 JS |
523 | for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--) |
524 | ; /* do nothing */ | |
2150554b JS |
525 | if (prefixcmp(sb.buf + i, sob.buf)) { |
526 | if (prefixcmp(sb.buf + i, sign_off_header)) | |
527 | strbuf_addch(&sb, '\n'); | |
13208572 | 528 | strbuf_addbuf(&sb, &sob); |
2150554b | 529 | } |
13208572 | 530 | strbuf_release(&sob); |
f5bbc322 KH |
531 | } |
532 | ||
13208572 | 533 | if (fwrite(sb.buf, 1, sb.len, fp) < sb.len) |
b5b644a9 | 534 | die("could not write commit template: %s", strerror(errno)); |
13208572 | 535 | |
f5bbc322 KH |
536 | strbuf_release(&sb); |
537 | ||
e83dbe80 SB |
538 | determine_author_info(); |
539 | ||
bb1ae3f6 SB |
540 | /* This checks if committer ident is explicitly given */ |
541 | git_committer_info(0); | |
ec84bd00 | 542 | if (use_editor) { |
e83dbe80 SB |
543 | char *author_ident; |
544 | const char *committer_ident; | |
545 | ||
ec84bd00 PB |
546 | if (in_merge) |
547 | fprintf(fp, | |
548 | "#\n" | |
549 | "# It looks like you may be committing a MERGE.\n" | |
550 | "# If this is not correct, please remove the file\n" | |
551 | "# %s\n" | |
552 | "# and try again.\n" | |
553 | "#\n", | |
554 | git_path("MERGE_HEAD")); | |
555 | ||
556 | fprintf(fp, | |
557 | "\n" | |
fdc7c811 | 558 | "# Please enter the commit message for your changes."); |
ec84bd00 | 559 | if (cleanup_mode == CLEANUP_ALL) |
fdc7c811 JK |
560 | fprintf(fp, |
561 | " Lines starting\n" | |
562 | "# with '#' will be ignored, and an empty" | |
563 | " message aborts the commit.\n"); | |
ec84bd00 | 564 | else /* CLEANUP_SPACE, that is. */ |
fdc7c811 JK |
565 | fprintf(fp, |
566 | " Lines starting\n" | |
567 | "# with '#' will be kept; you may remove them" | |
568 | " yourself if you want to.\n" | |
569 | "# An empty message aborts the commit.\n"); | |
ec84bd00 PB |
570 | if (only_include_assumed) |
571 | fprintf(fp, "# %s\n", only_include_assumed); | |
572 | ||
e83dbe80 SB |
573 | author_ident = xstrdup(fmt_name(author_name, author_email)); |
574 | committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"), | |
575 | getenv("GIT_COMMITTER_EMAIL")); | |
576 | if (strcmp(author_ident, committer_ident)) | |
577 | fprintf(fp, | |
bb1ae3f6 SB |
578 | "%s" |
579 | "# Author: %s\n", | |
580 | ident_shown++ ? "" : "#\n", | |
e83dbe80 SB |
581 | author_ident); |
582 | free(author_ident); | |
583 | ||
bb1ae3f6 SB |
584 | if (!user_ident_explicitly_given) |
585 | fprintf(fp, | |
586 | "%s" | |
587 | "# Committer: %s\n", | |
588 | ident_shown++ ? "" : "#\n", | |
589 | committer_ident); | |
590 | ||
591 | if (ident_shown) | |
592 | fprintf(fp, "#\n"); | |
593 | ||
ec84bd00 PB |
594 | saved_color_setting = wt_status_use_color; |
595 | wt_status_use_color = 0; | |
596 | commitable = run_status(fp, index_file, prefix, 1); | |
597 | wt_status_use_color = saved_color_setting; | |
598 | } else { | |
7168624c | 599 | struct rev_info rev; |
d616a239 | 600 | unsigned char sha1[20]; |
fbcf1184 | 601 | const char *parent = "HEAD"; |
7168624c | 602 | |
7168624c AR |
603 | if (!active_nr && read_cache() < 0) |
604 | die("Cannot read index"); | |
605 | ||
fbcf1184 JH |
606 | if (amend) |
607 | parent = "HEAD^1"; | |
608 | ||
d616a239 | 609 | if (get_sha1(parent, sha1)) |
ec84bd00 PB |
610 | commitable = !!active_nr; |
611 | else { | |
612 | init_revisions(&rev, ""); | |
613 | rev.abbrev = 0; | |
614 | setup_revisions(0, NULL, &rev, parent); | |
615 | DIFF_OPT_SET(&rev.diffopt, QUIET); | |
616 | DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS); | |
617 | run_diff_index(&rev, 1 /* cached */); | |
618 | ||
619 | commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES); | |
620 | } | |
621 | } | |
d616a239 | 622 | |
ec84bd00 | 623 | fclose(fp); |
7168624c | 624 | |
ec84bd00 PB |
625 | if (!commitable && !in_merge && !allow_empty && |
626 | !(amend && is_a_merge(head_sha1))) { | |
627 | run_status(stdout, index_file, prefix, 0); | |
ec84bd00 | 628 | return 0; |
7168624c AR |
629 | } |
630 | ||
ec84bd00 PB |
631 | /* |
632 | * Re-read the index as pre-commit hook could have updated it, | |
633 | * and write it out as a tree. We must do this before we invoke | |
634 | * the editor and after we invoke run_status above. | |
635 | */ | |
636 | discard_cache(); | |
637 | read_cache_from(index_file); | |
638 | if (!active_cache_tree) | |
639 | active_cache_tree = cache_tree(); | |
640 | if (cache_tree_update(active_cache_tree, | |
641 | active_cache, active_nr, 0, 0) < 0) { | |
331fcb59 | 642 | error("Error building trees"); |
ec84bd00 | 643 | return 0; |
7168624c | 644 | } |
f5bbc322 | 645 | |
8089c85b PB |
646 | if (run_hook(index_file, "prepare-commit-msg", |
647 | git_path(commit_editmsg), hook_arg1, hook_arg2, NULL)) | |
648 | return 0; | |
f5bbc322 | 649 | |
ec84bd00 PB |
650 | if (use_editor) { |
651 | char index[PATH_MAX]; | |
652 | const char *env[2] = { index, NULL }; | |
653 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file); | |
7198203a SB |
654 | if (launch_editor(git_path(commit_editmsg), NULL, env)) { |
655 | fprintf(stderr, | |
656 | "Please supply the message using either -m or -F option.\n"); | |
657 | exit(1); | |
658 | } | |
ec84bd00 | 659 | } |
f5bbc322 | 660 | |
ec84bd00 PB |
661 | if (!no_verify && |
662 | run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) { | |
663 | return 0; | |
664 | } | |
f5bbc322 | 665 | |
ec84bd00 | 666 | return 1; |
f5bbc322 KH |
667 | } |
668 | ||
669 | /* | |
6bb6b034 MV |
670 | * Find out if the message in the strbuf contains only whitespace and |
671 | * Signed-off-by lines. | |
f5bbc322 | 672 | */ |
6bb6b034 | 673 | static int message_is_empty(struct strbuf *sb) |
f5bbc322 | 674 | { |
f285a2d7 | 675 | struct strbuf tmpl = STRBUF_INIT; |
f5bbc322 | 676 | const char *nl; |
6bb6b034 | 677 | int eol, i, start = 0; |
f5bbc322 | 678 | |
5f065737 AR |
679 | if (cleanup_mode == CLEANUP_NONE && sb->len) |
680 | return 0; | |
681 | ||
f5bbc322 | 682 | /* See if the template is just a prefix of the message. */ |
f5bbc322 | 683 | if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) { |
5f065737 | 684 | stripspace(&tmpl, cleanup_mode == CLEANUP_ALL); |
f5bbc322 KH |
685 | if (start + tmpl.len <= sb->len && |
686 | memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0) | |
687 | start += tmpl.len; | |
688 | } | |
689 | strbuf_release(&tmpl); | |
690 | ||
691 | /* Check if the rest is just whitespace and Signed-of-by's. */ | |
692 | for (i = start; i < sb->len; i++) { | |
693 | nl = memchr(sb->buf + i, '\n', sb->len - i); | |
694 | if (nl) | |
695 | eol = nl - sb->buf; | |
696 | else | |
697 | eol = sb->len; | |
698 | ||
699 | if (strlen(sign_off_header) <= eol - i && | |
700 | !prefixcmp(sb->buf + i, sign_off_header)) { | |
701 | i = eol; | |
702 | continue; | |
703 | } | |
704 | while (i < eol) | |
705 | if (!isspace(sb->buf[i++])) | |
706 | return 0; | |
707 | } | |
708 | ||
709 | return 1; | |
710 | } | |
711 | ||
146ea068 JH |
712 | static const char *find_author_by_nickname(const char *name) |
713 | { | |
714 | struct rev_info revs; | |
715 | struct commit *commit; | |
716 | struct strbuf buf = STRBUF_INIT; | |
717 | const char *av[20]; | |
718 | int ac = 0; | |
719 | ||
720 | init_revisions(&revs, NULL); | |
721 | strbuf_addf(&buf, "--author=%s", name); | |
722 | av[++ac] = "--all"; | |
723 | av[++ac] = "-i"; | |
724 | av[++ac] = buf.buf; | |
725 | av[++ac] = NULL; | |
726 | setup_revisions(ac, av, &revs, NULL); | |
727 | prepare_revision_walk(&revs); | |
728 | commit = get_revision(&revs); | |
729 | if (commit) { | |
730 | strbuf_release(&buf); | |
731 | format_commit_message(commit, "%an <%ae>", &buf, DATE_NORMAL); | |
732 | return strbuf_detach(&buf, NULL); | |
733 | } | |
734 | die("No existing author found with '%s'", name); | |
735 | } | |
736 | ||
2f02b25f | 737 | static int parse_and_validate_options(int argc, const char *argv[], |
dbd0f5c7 JH |
738 | const char * const usage[], |
739 | const char *prefix) | |
f5bbc322 KH |
740 | { |
741 | int f = 0; | |
742 | ||
2f02b25f | 743 | argc = parse_options(argc, argv, builtin_commit_options, usage, 0); |
dbd0f5c7 JH |
744 | logfile = parse_options_fix_filename(prefix, logfile); |
745 | template_file = parse_options_fix_filename(prefix, template_file); | |
f5bbc322 | 746 | |
146ea068 JH |
747 | if (force_author && !strchr(force_author, '>')) |
748 | force_author = find_author_by_nickname(force_author); | |
749 | ||
f9568530 | 750 | if (logfile || message.len || use_message) |
4803466f | 751 | use_editor = 0; |
f5bbc322 | 752 | if (edit_flag) |
4803466f | 753 | use_editor = 1; |
406400ce PB |
754 | if (!use_editor) |
755 | setenv("GIT_EDITOR", ":", 1); | |
f5bbc322 KH |
756 | |
757 | if (get_sha1("HEAD", head_sha1)) | |
758 | initial_commit = 1; | |
759 | ||
760 | if (!get_sha1("MERGE_HEAD", merge_head_sha1)) | |
761 | in_merge = 1; | |
762 | ||
763 | /* Sanity check options */ | |
764 | if (amend && initial_commit) | |
765 | die("You have nothing to amend."); | |
766 | if (amend && in_merge) | |
b5b644a9 | 767 | die("You are in the middle of a merge -- cannot amend."); |
f5bbc322 KH |
768 | |
769 | if (use_message) | |
770 | f++; | |
771 | if (edit_message) | |
772 | f++; | |
773 | if (logfile) | |
774 | f++; | |
775 | if (f > 1) | |
776 | die("Only one of -c/-C/-F can be used."); | |
f9568530 | 777 | if (message.len && f > 0) |
f5bbc322 KH |
778 | die("Option -m cannot be combined with -c/-C/-F."); |
779 | if (edit_message) | |
780 | use_message = edit_message; | |
1eb1e9ee | 781 | if (amend && !use_message) |
f5bbc322 KH |
782 | use_message = "HEAD"; |
783 | if (use_message) { | |
784 | unsigned char sha1[20]; | |
785 | static char utf8[] = "UTF-8"; | |
786 | const char *out_enc; | |
787 | char *enc, *end; | |
788 | struct commit *commit; | |
789 | ||
790 | if (get_sha1(use_message, sha1)) | |
791 | die("could not lookup commit %s", use_message); | |
8a2f8733 | 792 | commit = lookup_commit_reference(sha1); |
f5bbc322 KH |
793 | if (!commit || parse_commit(commit)) |
794 | die("could not parse commit %s", use_message); | |
795 | ||
796 | enc = strstr(commit->buffer, "\nencoding"); | |
797 | if (enc) { | |
798 | end = strchr(enc + 10, '\n'); | |
799 | enc = xstrndup(enc + 10, end - (enc + 10)); | |
800 | } else { | |
801 | enc = utf8; | |
802 | } | |
803 | out_enc = git_commit_encoding ? git_commit_encoding : utf8; | |
804 | ||
805 | if (strcmp(out_enc, enc)) | |
806 | use_message_buffer = | |
807 | reencode_string(commit->buffer, out_enc, enc); | |
808 | ||
809 | /* | |
810 | * If we failed to reencode the buffer, just copy it | |
811 | * byte for byte so the user can try to fix it up. | |
812 | * This also handles the case where input and output | |
813 | * encodings are identical. | |
814 | */ | |
815 | if (use_message_buffer == NULL) | |
816 | use_message_buffer = xstrdup(commit->buffer); | |
817 | if (enc != utf8) | |
818 | free(enc); | |
819 | } | |
820 | ||
821 | if (!!also + !!only + !!all + !!interactive > 1) | |
822 | die("Only one of --include/--only/--all/--interactive can be used."); | |
823 | if (argc == 0 && (also || (only && !amend))) | |
824 | die("No paths with --include/--only does not make sense."); | |
825 | if (argc == 0 && only && amend) | |
826 | only_include_assumed = "Clever... amending the last one with dirty index."; | |
3c5283f8 | 827 | if (argc > 0 && !also && !only) |
f5bbc322 | 828 | only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths..."; |
5f065737 AR |
829 | if (!cleanup_arg || !strcmp(cleanup_arg, "default")) |
830 | cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; | |
831 | else if (!strcmp(cleanup_arg, "verbatim")) | |
832 | cleanup_mode = CLEANUP_NONE; | |
833 | else if (!strcmp(cleanup_arg, "whitespace")) | |
834 | cleanup_mode = CLEANUP_SPACE; | |
835 | else if (!strcmp(cleanup_arg, "strip")) | |
836 | cleanup_mode = CLEANUP_ALL; | |
837 | else | |
838 | die("Invalid cleanup mode %s", cleanup_arg); | |
f5bbc322 | 839 | |
4bfee30a MSO |
840 | if (!untracked_files_arg) |
841 | ; /* default already initialized */ | |
6c2ce048 MSO |
842 | else if (!strcmp(untracked_files_arg, "no")) |
843 | show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
4bfee30a MSO |
844 | else if (!strcmp(untracked_files_arg, "normal")) |
845 | show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
846 | else if (!strcmp(untracked_files_arg, "all")) | |
847 | show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
848 | else | |
849 | die("Invalid untracked files mode '%s'", untracked_files_arg); | |
850 | ||
f5bbc322 KH |
851 | if (all && argc > 0) |
852 | die("Paths with -a does not make sense."); | |
853 | else if (interactive && argc > 0) | |
854 | die("Paths with --interactive does not make sense."); | |
855 | ||
856 | return argc; | |
857 | } | |
858 | ||
859 | int cmd_status(int argc, const char **argv, const char *prefix) | |
860 | { | |
861 | const char *index_file; | |
862 | int commitable; | |
863 | ||
ef90d6d4 | 864 | git_config(git_status_config, NULL); |
f5bbc322 | 865 | |
6b2f2d98 MK |
866 | if (wt_status_use_color == -1) |
867 | wt_status_use_color = git_use_color_default; | |
868 | ||
38920dd6 MH |
869 | if (diff_use_color_default == -1) |
870 | diff_use_color_default = git_use_color_default; | |
871 | ||
dbd0f5c7 | 872 | argc = parse_and_validate_options(argc, argv, builtin_status_usage, prefix); |
f5bbc322 | 873 | |
f64fe7b4 | 874 | index_file = prepare_index(argc, argv, prefix); |
f5bbc322 | 875 | |
37d07f8f | 876 | commitable = run_status(stdout, index_file, prefix, 0); |
f5bbc322 | 877 | |
2888605c | 878 | rollback_index_files(); |
f5bbc322 KH |
879 | |
880 | return commitable ? 0 : 1; | |
881 | } | |
882 | ||
f5bbc322 KH |
883 | static void print_summary(const char *prefix, const unsigned char *sha1) |
884 | { | |
885 | struct rev_info rev; | |
886 | struct commit *commit; | |
c85db254 JK |
887 | static const char *format = "format:%h: \"%s\""; |
888 | unsigned char junk_sha1[20]; | |
889 | const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL); | |
f5bbc322 KH |
890 | |
891 | commit = lookup_commit(sha1); | |
892 | if (!commit) | |
b5b644a9 | 893 | die("couldn't look up newly created commit"); |
f5bbc322 KH |
894 | if (!commit || parse_commit(commit)) |
895 | die("could not parse newly created commit"); | |
896 | ||
897 | init_revisions(&rev, prefix); | |
898 | setup_revisions(0, NULL, &rev, NULL); | |
899 | ||
900 | rev.abbrev = 0; | |
901 | rev.diff = 1; | |
902 | rev.diffopt.output_format = | |
903 | DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY; | |
904 | ||
905 | rev.verbose_header = 1; | |
906 | rev.show_root_diff = 1; | |
e502f9e7 | 907 | get_commit_format(format, &rev); |
bf82a150 | 908 | rev.always_show_header = 0; |
3eb2a15e JH |
909 | rev.diffopt.detect_rename = 1; |
910 | rev.diffopt.rename_limit = 100; | |
911 | rev.diffopt.break_opt = 0; | |
15964563 | 912 | diff_setup_done(&rev.diffopt); |
f5bbc322 | 913 | |
c85db254 JK |
914 | printf("[%s%s]: created ", |
915 | !prefixcmp(head, "refs/heads/") ? | |
916 | head + 11 : | |
917 | !strcmp(head, "HEAD") ? | |
918 | "detached HEAD" : | |
919 | head, | |
920 | initial_commit ? " (root-commit)" : ""); | |
f5bbc322 | 921 | |
bf82a150 JH |
922 | if (!log_tree_commit(&rev, commit)) { |
923 | struct strbuf buf = STRBUF_INIT; | |
e502f9e7 | 924 | format_commit_message(commit, format + 7, &buf, DATE_NORMAL); |
bf82a150 JH |
925 | printf("%s\n", buf.buf); |
926 | strbuf_release(&buf); | |
927 | } | |
f5bbc322 KH |
928 | } |
929 | ||
186458b1 | 930 | static int git_commit_config(const char *k, const char *v, void *cb) |
f5bbc322 | 931 | { |
984c6e7e BH |
932 | if (!strcmp(k, "commit.template")) |
933 | return git_config_string(&template_file, k, v); | |
f5bbc322 | 934 | |
ef90d6d4 | 935 | return git_status_config(k, v, cb); |
f5bbc322 KH |
936 | } |
937 | ||
f5bbc322 KH |
938 | int cmd_commit(int argc, const char **argv, const char *prefix) |
939 | { | |
f285a2d7 | 940 | struct strbuf sb = STRBUF_INIT; |
f5bbc322 | 941 | const char *index_file, *reflog_msg; |
99a12694 | 942 | char *nl, *p; |
f5bbc322 KH |
943 | unsigned char commit_sha1[20]; |
944 | struct ref_lock *ref_lock; | |
6bb6b034 | 945 | struct commit_list *parents = NULL, **pptr = &parents; |
cf10f9fd MV |
946 | struct stat statbuf; |
947 | int allow_fast_forward = 1; | |
f5bbc322 | 948 | |
ef90d6d4 | 949 | git_config(git_commit_config, NULL); |
f5bbc322 | 950 | |
3f4b609f MH |
951 | if (wt_status_use_color == -1) |
952 | wt_status_use_color = git_use_color_default; | |
953 | ||
dbd0f5c7 | 954 | argc = parse_and_validate_options(argc, argv, builtin_commit_usage, prefix); |
f5bbc322 | 955 | |
f64fe7b4 | 956 | index_file = prepare_index(argc, argv, prefix); |
f5bbc322 | 957 | |
ec84bd00 PB |
958 | /* Set up everything for writing the commit object. This includes |
959 | running hooks, writing the trees, and interacting with the user. */ | |
960 | if (!prepare_to_commit(index_file, prefix)) { | |
2888605c | 961 | rollback_index_files(); |
f5bbc322 KH |
962 | return 1; |
963 | } | |
964 | ||
f5bbc322 KH |
965 | /* Determine parents */ |
966 | if (initial_commit) { | |
967 | reflog_msg = "commit (initial)"; | |
f5bbc322 KH |
968 | } else if (amend) { |
969 | struct commit_list *c; | |
970 | struct commit *commit; | |
971 | ||
972 | reflog_msg = "commit (amend)"; | |
973 | commit = lookup_commit(head_sha1); | |
974 | if (!commit || parse_commit(commit)) | |
975 | die("could not parse HEAD commit"); | |
976 | ||
977 | for (c = commit->parents; c; c = c->next) | |
6bb6b034 | 978 | pptr = &commit_list_insert(c->item, pptr)->next; |
f5bbc322 | 979 | } else if (in_merge) { |
f285a2d7 | 980 | struct strbuf m = STRBUF_INIT; |
f5bbc322 KH |
981 | FILE *fp; |
982 | ||
983 | reflog_msg = "commit (merge)"; | |
6bb6b034 | 984 | pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; |
f5bbc322 KH |
985 | fp = fopen(git_path("MERGE_HEAD"), "r"); |
986 | if (fp == NULL) | |
987 | die("could not open %s for reading: %s", | |
988 | git_path("MERGE_HEAD"), strerror(errno)); | |
7c3fd25d LT |
989 | while (strbuf_getline(&m, fp, '\n') != EOF) { |
990 | unsigned char sha1[20]; | |
991 | if (get_sha1_hex(m.buf, sha1) < 0) | |
992 | die("Corrupt MERGE_HEAD file (%s)", m.buf); | |
6bb6b034 | 993 | pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next; |
7c3fd25d | 994 | } |
f5bbc322 KH |
995 | fclose(fp); |
996 | strbuf_release(&m); | |
cf10f9fd MV |
997 | if (!stat(git_path("MERGE_MODE"), &statbuf)) { |
998 | if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0) | |
999 | die("could not read MERGE_MODE: %s", | |
1000 | strerror(errno)); | |
1001 | if (!strcmp(sb.buf, "no-ff")) | |
1002 | allow_fast_forward = 0; | |
1003 | } | |
1004 | if (allow_fast_forward) | |
1005 | parents = reduce_heads(parents); | |
f5bbc322 KH |
1006 | } else { |
1007 | reflog_msg = "commit"; | |
6bb6b034 | 1008 | pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next; |
f5bbc322 | 1009 | } |
f5bbc322 | 1010 | |
ec84bd00 | 1011 | /* Finally, get the commit message */ |
cf10f9fd | 1012 | strbuf_reset(&sb); |
740001a5 JH |
1013 | if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) { |
1014 | rollback_index_files(); | |
1015 | die("could not read commit message"); | |
1016 | } | |
99a12694 KH |
1017 | |
1018 | /* Truncate the message just before the diff, if any. */ | |
0b38227f JK |
1019 | if (verbose) { |
1020 | p = strstr(sb.buf, "\ndiff --git "); | |
1021 | if (p != NULL) | |
1022 | strbuf_setlen(&sb, p - sb.buf + 1); | |
1023 | } | |
99a12694 | 1024 | |
5f065737 AR |
1025 | if (cleanup_mode != CLEANUP_NONE) |
1026 | stripspace(&sb, cleanup_mode == CLEANUP_ALL); | |
6bb6b034 | 1027 | if (message_is_empty(&sb)) { |
2888605c | 1028 | rollback_index_files(); |
fdc7c811 JK |
1029 | fprintf(stderr, "Aborting commit due to empty commit message.\n"); |
1030 | exit(1); | |
2888605c | 1031 | } |
f5bbc322 | 1032 | |
6bb6b034 MV |
1033 | if (commit_tree(sb.buf, active_cache_tree->sha1, parents, commit_sha1, |
1034 | fmt_ident(author_name, author_email, author_date, | |
1035 | IDENT_ERROR_ON_NO_NAME))) { | |
2888605c | 1036 | rollback_index_files(); |
f5bbc322 | 1037 | die("failed to write commit object"); |
2888605c | 1038 | } |
f5bbc322 KH |
1039 | |
1040 | ref_lock = lock_any_ref_for_update("HEAD", | |
1041 | initial_commit ? NULL : head_sha1, | |
1042 | 0); | |
1043 | ||
6bb6b034 | 1044 | nl = strchr(sb.buf, '\n'); |
741707b1 JS |
1045 | if (nl) |
1046 | strbuf_setlen(&sb, nl + 1 - sb.buf); | |
1047 | else | |
1048 | strbuf_addch(&sb, '\n'); | |
741707b1 JS |
1049 | strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg)); |
1050 | strbuf_insert(&sb, strlen(reflog_msg), ": ", 2); | |
f5bbc322 | 1051 | |
2888605c JH |
1052 | if (!ref_lock) { |
1053 | rollback_index_files(); | |
f5bbc322 | 1054 | die("cannot lock HEAD ref"); |
2888605c JH |
1055 | } |
1056 | if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) { | |
1057 | rollback_index_files(); | |
f5bbc322 | 1058 | die("cannot update HEAD ref"); |
2888605c | 1059 | } |
f5bbc322 KH |
1060 | |
1061 | unlink(git_path("MERGE_HEAD")); | |
1062 | unlink(git_path("MERGE_MSG")); | |
cf10f9fd | 1063 | unlink(git_path("MERGE_MODE")); |
5a95b855 | 1064 | unlink(git_path("SQUASH_MSG")); |
f5bbc322 | 1065 | |
5a9dd399 BC |
1066 | if (commit_index_files()) |
1067 | die ("Repository has been updated, but unable to write\n" | |
1068 | "new_index file. Check that disk is not full or quota is\n" | |
1069 | "not exceeded, and then \"git reset HEAD\" to recover."); | |
f5bbc322 KH |
1070 | |
1071 | rerere(); | |
2888605c | 1072 | run_hook(get_index_file(), "post-commit", NULL); |
f5bbc322 KH |
1073 | if (!quiet) |
1074 | print_summary(prefix, commit_sha1); | |
1075 | ||
1076 | return 0; | |
1077 | } |