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