]>
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 | |
984c6e7e BH |
49 | static char *logfile, *force_author; |
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) { | |
3f061887 | 227 | interactive_add(argc, argv, prefix); |
d5350fd2 GP |
228 | if (read_cache() < 0) |
229 | die("index file corrupt"); | |
2888605c | 230 | commit_style = COMMIT_AS_IS; |
f5bbc322 KH |
231 | return get_index_file(); |
232 | } | |
233 | ||
f5bbc322 KH |
234 | if (read_cache() < 0) |
235 | die("index file corrupt"); | |
236 | ||
f64fe7b4 JH |
237 | if (*argv) |
238 | pathspec = get_pathspec(prefix, argv); | |
2888605c JH |
239 | |
240 | /* | |
241 | * Non partial, non as-is commit. | |
242 | * | |
243 | * (1) get the real index; | |
244 | * (2) update the_index as necessary; | |
245 | * (3) write the_index out to the real index (still locked); | |
246 | * (4) return the name of the locked index file. | |
247 | * | |
248 | * The caller should run hooks on the locked real index, and | |
249 | * (A) if all goes well, commit the real index; | |
250 | * (B) on failure, rollback the real index. | |
251 | */ | |
252 | if (all || (also && pathspec && *pathspec)) { | |
253 | int fd = hold_locked_index(&index_lock, 1); | |
7ae02a30 | 254 | add_files_to_cache(also ? prefix : NULL, pathspec, 0); |
d37d3203 | 255 | refresh_cache(REFRESH_QUIET); |
4ed7cd3a BC |
256 | if (write_cache(fd, active_cache, active_nr) || |
257 | close_lock_file(&index_lock)) | |
f5bbc322 | 258 | die("unable to write new_index file"); |
2888605c JH |
259 | commit_style = COMMIT_NORMAL; |
260 | return index_lock.filename; | |
f5bbc322 KH |
261 | } |
262 | ||
2888605c JH |
263 | /* |
264 | * As-is commit. | |
265 | * | |
266 | * (1) return the name of the real index file. | |
267 | * | |
268 | * The caller should run hooks on the real index, and run | |
269 | * hooks on the real index, and create commit from the_index. | |
270 | * We still need to refresh the index here. | |
271 | */ | |
272 | if (!pathspec || !*pathspec) { | |
273 | fd = hold_locked_index(&index_lock, 1); | |
274 | refresh_cache(REFRESH_QUIET); | |
275 | if (write_cache(fd, active_cache, active_nr) || | |
4439751d | 276 | commit_locked_index(&index_lock)) |
2888605c JH |
277 | die("unable to write new_index file"); |
278 | commit_style = COMMIT_AS_IS; | |
f5bbc322 KH |
279 | return get_index_file(); |
280 | } | |
281 | ||
2888605c JH |
282 | /* |
283 | * A partial commit. | |
284 | * | |
285 | * (0) find the set of affected paths; | |
286 | * (1) get lock on the real index file; | |
287 | * (2) update the_index with the given paths; | |
288 | * (3) write the_index out to the real index (still locked); | |
289 | * (4) get lock on the false index file; | |
290 | * (5) reset the_index from HEAD; | |
291 | * (6) update the_index the same way as (2); | |
292 | * (7) write the_index out to the false index file; | |
293 | * (8) return the name of the false index file (still locked); | |
294 | * | |
295 | * The caller should run hooks on the locked false index, and | |
296 | * create commit from it. Then | |
297 | * (A) if all goes well, commit the real index; | |
298 | * (B) on failure, rollback the real index; | |
299 | * In either case, rollback the false index. | |
300 | */ | |
301 | commit_style = COMMIT_PARTIAL; | |
302 | ||
303 | if (file_exists(git_path("MERGE_HEAD"))) | |
304 | die("cannot do a partial commit during a merge."); | |
305 | ||
306 | memset(&partial, 0, sizeof(partial)); | |
c455c87c | 307 | partial.strdup_strings = 1; |
2888605c JH |
308 | if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec)) |
309 | exit(1); | |
310 | ||
311 | discard_cache(); | |
312 | if (read_cache() < 0) | |
313 | die("cannot read the index"); | |
314 | ||
315 | fd = hold_locked_index(&index_lock, 1); | |
316 | add_remove_files(&partial); | |
ef12b50d | 317 | refresh_cache(REFRESH_QUIET); |
4ed7cd3a BC |
318 | if (write_cache(fd, active_cache, active_nr) || |
319 | close_lock_file(&index_lock)) | |
f5bbc322 KH |
320 | die("unable to write new_index file"); |
321 | ||
2888605c JH |
322 | fd = hold_lock_file_for_update(&false_lock, |
323 | git_path("next-index-%d", getpid()), 1); | |
fa9dcf80 LT |
324 | |
325 | create_base_index(); | |
2888605c | 326 | add_remove_files(&partial); |
d37d3203 | 327 | refresh_cache(REFRESH_QUIET); |
f5bbc322 | 328 | |
4ed7cd3a BC |
329 | if (write_cache(fd, active_cache, active_nr) || |
330 | close_lock_file(&false_lock)) | |
2888605c | 331 | die("unable to write temporary index file"); |
959ba670 JK |
332 | |
333 | discard_cache(); | |
334 | read_cache_from(false_lock.filename); | |
335 | ||
2888605c | 336 | return false_lock.filename; |
f5bbc322 KH |
337 | } |
338 | ||
37d07f8f | 339 | static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn) |
f5bbc322 KH |
340 | { |
341 | struct wt_status s; | |
342 | ||
343 | wt_status_prepare(&s); | |
46f721c8 JK |
344 | if (wt_status_relative_paths) |
345 | s.prefix = prefix; | |
f5bbc322 KH |
346 | |
347 | if (amend) { | |
348 | s.amend = 1; | |
349 | s.reference = "HEAD^1"; | |
350 | } | |
351 | s.verbose = verbose; | |
4bfee30a | 352 | s.untracked = (show_untracked_files == SHOW_ALL_UNTRACKED_FILES); |
f5bbc322 KH |
353 | s.index_file = index_file; |
354 | s.fp = fp; | |
37d07f8f | 355 | s.nowarn = nowarn; |
f5bbc322 KH |
356 | |
357 | wt_status_print(&s); | |
358 | ||
359 | return s.commitable; | |
360 | } | |
361 | ||
3473f303 PB |
362 | static int run_hook(const char *index_file, const char *name, ...) |
363 | { | |
364 | struct child_process hook; | |
365 | const char *argv[10], *env[2]; | |
366 | char index[PATH_MAX]; | |
367 | va_list args; | |
368 | int i; | |
369 | ||
370 | va_start(args, name); | |
371 | argv[0] = git_path("hooks/%s", name); | |
372 | i = 0; | |
373 | do { | |
374 | if (++i >= ARRAY_SIZE(argv)) | |
375 | die ("run_hook(): too many arguments"); | |
376 | argv[i] = va_arg(args, const char *); | |
377 | } while (argv[i]); | |
378 | va_end(args); | |
379 | ||
380 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file); | |
381 | env[0] = index; | |
382 | env[1] = NULL; | |
383 | ||
384 | if (access(argv[0], X_OK) < 0) | |
385 | return 0; | |
386 | ||
387 | memset(&hook, 0, sizeof(hook)); | |
388 | hook.argv = argv; | |
389 | hook.no_stdin = 1; | |
390 | hook.stdout_to_stderr = 1; | |
391 | hook.env = env; | |
392 | ||
393 | return run_command(&hook); | |
394 | } | |
395 | ||
ec84bd00 PB |
396 | static int is_a_merge(const unsigned char *sha1) |
397 | { | |
398 | struct commit *commit = lookup_commit(sha1); | |
399 | if (!commit || parse_commit(commit)) | |
400 | die("could not parse HEAD commit"); | |
401 | return !!(commit->parents && commit->parents->next); | |
402 | } | |
403 | ||
f5bbc322 KH |
404 | static const char sign_off_header[] = "Signed-off-by: "; |
405 | ||
e83dbe80 | 406 | static void determine_author_info(void) |
a45d46ba SB |
407 | { |
408 | char *name, *email, *date; | |
409 | ||
410 | name = getenv("GIT_AUTHOR_NAME"); | |
411 | email = getenv("GIT_AUTHOR_EMAIL"); | |
412 | date = getenv("GIT_AUTHOR_DATE"); | |
413 | ||
414 | if (use_message) { | |
415 | const char *a, *lb, *rb, *eol; | |
416 | ||
417 | a = strstr(use_message_buffer, "\nauthor "); | |
418 | if (!a) | |
419 | die("invalid commit: %s", use_message); | |
420 | ||
421 | lb = strstr(a + 8, " <"); | |
422 | rb = strstr(a + 8, "> "); | |
423 | eol = strchr(a + 8, '\n'); | |
424 | if (!lb || !rb || !eol) | |
425 | die("invalid commit: %s", use_message); | |
426 | ||
427 | name = xstrndup(a + 8, lb - (a + 8)); | |
428 | email = xstrndup(lb + 2, rb - (lb + 2)); | |
429 | date = xstrndup(rb + 2, eol - (rb + 2)); | |
430 | } | |
431 | ||
432 | if (force_author) { | |
433 | const char *lb = strstr(force_author, " <"); | |
434 | const char *rb = strchr(force_author, '>'); | |
435 | ||
436 | if (!lb || !rb) | |
437 | die("malformed --author parameter"); | |
438 | name = xstrndup(force_author, lb - force_author); | |
439 | email = xstrndup(lb + 2, rb - (lb + 2)); | |
440 | } | |
441 | ||
e83dbe80 SB |
442 | author_name = name; |
443 | author_email = email; | |
444 | author_date = date; | |
a45d46ba SB |
445 | } |
446 | ||
ec84bd00 | 447 | static int prepare_to_commit(const char *index_file, const char *prefix) |
f5bbc322 KH |
448 | { |
449 | struct stat statbuf; | |
bc5d248a | 450 | int commitable, saved_color_setting; |
f5bbc322 KH |
451 | struct strbuf sb; |
452 | char *buffer; | |
453 | FILE *fp; | |
8089c85b PB |
454 | const char *hook_arg1 = NULL; |
455 | const char *hook_arg2 = NULL; | |
bb1ae3f6 | 456 | int ident_shown = 0; |
f5bbc322 | 457 | |
ec84bd00 PB |
458 | if (!no_verify && run_hook(index_file, "pre-commit", NULL)) |
459 | return 0; | |
f5bbc322 KH |
460 | |
461 | strbuf_init(&sb, 0); | |
f9568530 JS |
462 | if (message.len) { |
463 | strbuf_addbuf(&sb, &message); | |
8089c85b | 464 | hook_arg1 = "message"; |
f5bbc322 KH |
465 | } else if (logfile && !strcmp(logfile, "-")) { |
466 | if (isatty(0)) | |
467 | fprintf(stderr, "(reading log message from standard input)\n"); | |
468 | if (strbuf_read(&sb, 0, 0) < 0) | |
469 | die("could not read log from standard input"); | |
8089c85b | 470 | hook_arg1 = "message"; |
f5bbc322 KH |
471 | } else if (logfile) { |
472 | if (strbuf_read_file(&sb, logfile, 0) < 0) | |
473 | die("could not read log file '%s': %s", | |
474 | logfile, strerror(errno)); | |
8089c85b | 475 | hook_arg1 = "message"; |
f5bbc322 KH |
476 | } else if (use_message) { |
477 | buffer = strstr(use_message_buffer, "\n\n"); | |
478 | if (!buffer || buffer[2] == '\0') | |
479 | die("commit has empty message"); | |
480 | strbuf_add(&sb, buffer + 2, strlen(buffer + 2)); | |
8089c85b PB |
481 | hook_arg1 = "commit"; |
482 | hook_arg2 = use_message; | |
f5bbc322 KH |
483 | } else if (!stat(git_path("MERGE_MSG"), &statbuf)) { |
484 | if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0) | |
485 | die("could not read MERGE_MSG: %s", strerror(errno)); | |
8089c85b | 486 | hook_arg1 = "merge"; |
f5bbc322 KH |
487 | } else if (!stat(git_path("SQUASH_MSG"), &statbuf)) { |
488 | if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0) | |
489 | die("could not read SQUASH_MSG: %s", strerror(errno)); | |
8089c85b | 490 | hook_arg1 = "squash"; |
f5bbc322 KH |
491 | } else if (template_file && !stat(template_file, &statbuf)) { |
492 | if (strbuf_read_file(&sb, template_file, 0) < 0) | |
493 | die("could not read %s: %s", | |
494 | template_file, strerror(errno)); | |
8089c85b | 495 | hook_arg1 = "template"; |
f5bbc322 KH |
496 | } |
497 | ||
8089c85b PB |
498 | /* |
499 | * This final case does not modify the template message, | |
500 | * it just sets the argument to the prepare-commit-msg hook. | |
501 | */ | |
502 | else if (in_merge) | |
503 | hook_arg1 = "merge"; | |
504 | ||
f5bbc322 KH |
505 | fp = fopen(git_path(commit_editmsg), "w"); |
506 | if (fp == NULL) | |
cdeaf10f CP |
507 | die("could not open %s: %s", |
508 | git_path(commit_editmsg), strerror(errno)); | |
f5bbc322 | 509 | |
5f065737 AR |
510 | if (cleanup_mode != CLEANUP_NONE) |
511 | stripspace(&sb, 0); | |
f5bbc322 KH |
512 | |
513 | if (signoff) { | |
13208572 JS |
514 | struct strbuf sob; |
515 | int i; | |
516 | ||
517 | strbuf_init(&sob, 0); | |
518 | strbuf_addstr(&sob, sign_off_header); | |
d9ccfe77 JH |
519 | strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"), |
520 | getenv("GIT_COMMITTER_EMAIL"))); | |
13208572 | 521 | strbuf_addch(&sob, '\n'); |
13208572 JS |
522 | for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--) |
523 | ; /* do nothing */ | |
2150554b JS |
524 | if (prefixcmp(sb.buf + i, sob.buf)) { |
525 | if (prefixcmp(sb.buf + i, sign_off_header)) | |
526 | strbuf_addch(&sb, '\n'); | |
13208572 | 527 | strbuf_addbuf(&sb, &sob); |
2150554b | 528 | } |
13208572 | 529 | strbuf_release(&sob); |
f5bbc322 KH |
530 | } |
531 | ||
13208572 | 532 | if (fwrite(sb.buf, 1, sb.len, fp) < sb.len) |
b5b644a9 | 533 | die("could not write commit template: %s", strerror(errno)); |
13208572 | 534 | |
f5bbc322 KH |
535 | strbuf_release(&sb); |
536 | ||
e83dbe80 SB |
537 | determine_author_info(); |
538 | ||
bb1ae3f6 SB |
539 | /* This checks if committer ident is explicitly given */ |
540 | git_committer_info(0); | |
ec84bd00 | 541 | if (use_editor) { |
e83dbe80 SB |
542 | char *author_ident; |
543 | const char *committer_ident; | |
544 | ||
ec84bd00 PB |
545 | if (in_merge) |
546 | fprintf(fp, | |
547 | "#\n" | |
548 | "# It looks like you may be committing a MERGE.\n" | |
549 | "# If this is not correct, please remove the file\n" | |
550 | "# %s\n" | |
551 | "# and try again.\n" | |
552 | "#\n", | |
553 | git_path("MERGE_HEAD")); | |
554 | ||
555 | fprintf(fp, | |
556 | "\n" | |
557 | "# Please enter the commit message for your changes.\n" | |
558 | "# (Comment lines starting with '#' will "); | |
559 | if (cleanup_mode == CLEANUP_ALL) | |
560 | fprintf(fp, "not be included)\n"); | |
561 | else /* CLEANUP_SPACE, that is. */ | |
562 | fprintf(fp, "be kept.\n" | |
563 | "# You can remove them yourself if you want to)\n"); | |
564 | if (only_include_assumed) | |
565 | fprintf(fp, "# %s\n", only_include_assumed); | |
566 | ||
e83dbe80 SB |
567 | author_ident = xstrdup(fmt_name(author_name, author_email)); |
568 | committer_ident = fmt_name(getenv("GIT_COMMITTER_NAME"), | |
569 | getenv("GIT_COMMITTER_EMAIL")); | |
570 | if (strcmp(author_ident, committer_ident)) | |
571 | fprintf(fp, | |
bb1ae3f6 SB |
572 | "%s" |
573 | "# Author: %s\n", | |
574 | ident_shown++ ? "" : "#\n", | |
e83dbe80 SB |
575 | author_ident); |
576 | free(author_ident); | |
577 | ||
bb1ae3f6 SB |
578 | if (!user_ident_explicitly_given) |
579 | fprintf(fp, | |
580 | "%s" | |
581 | "# Committer: %s\n", | |
582 | ident_shown++ ? "" : "#\n", | |
583 | committer_ident); | |
584 | ||
585 | if (ident_shown) | |
586 | fprintf(fp, "#\n"); | |
587 | ||
ec84bd00 PB |
588 | saved_color_setting = wt_status_use_color; |
589 | wt_status_use_color = 0; | |
590 | commitable = run_status(fp, index_file, prefix, 1); | |
591 | wt_status_use_color = saved_color_setting; | |
592 | } else { | |
7168624c | 593 | struct rev_info rev; |
d616a239 | 594 | unsigned char sha1[20]; |
fbcf1184 | 595 | const char *parent = "HEAD"; |
7168624c | 596 | |
7168624c AR |
597 | if (!active_nr && read_cache() < 0) |
598 | die("Cannot read index"); | |
599 | ||
fbcf1184 JH |
600 | if (amend) |
601 | parent = "HEAD^1"; | |
602 | ||
d616a239 | 603 | if (get_sha1(parent, sha1)) |
ec84bd00 PB |
604 | commitable = !!active_nr; |
605 | else { | |
606 | init_revisions(&rev, ""); | |
607 | rev.abbrev = 0; | |
608 | setup_revisions(0, NULL, &rev, parent); | |
609 | DIFF_OPT_SET(&rev.diffopt, QUIET); | |
610 | DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS); | |
611 | run_diff_index(&rev, 1 /* cached */); | |
612 | ||
613 | commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES); | |
614 | } | |
615 | } | |
d616a239 | 616 | |
ec84bd00 | 617 | fclose(fp); |
7168624c | 618 | |
ec84bd00 PB |
619 | if (!commitable && !in_merge && !allow_empty && |
620 | !(amend && is_a_merge(head_sha1))) { | |
621 | run_status(stdout, index_file, prefix, 0); | |
622 | unlink(commit_editmsg); | |
623 | return 0; | |
7168624c AR |
624 | } |
625 | ||
ec84bd00 PB |
626 | /* |
627 | * Re-read the index as pre-commit hook could have updated it, | |
628 | * and write it out as a tree. We must do this before we invoke | |
629 | * the editor and after we invoke run_status above. | |
630 | */ | |
631 | discard_cache(); | |
632 | read_cache_from(index_file); | |
633 | if (!active_cache_tree) | |
634 | active_cache_tree = cache_tree(); | |
635 | if (cache_tree_update(active_cache_tree, | |
636 | active_cache, active_nr, 0, 0) < 0) { | |
637 | error("Error building trees"); | |
638 | return 0; | |
7168624c | 639 | } |
f5bbc322 | 640 | |
8089c85b PB |
641 | if (run_hook(index_file, "prepare-commit-msg", |
642 | git_path(commit_editmsg), hook_arg1, hook_arg2, NULL)) | |
643 | return 0; | |
f5bbc322 | 644 | |
ec84bd00 PB |
645 | if (use_editor) { |
646 | char index[PATH_MAX]; | |
647 | const char *env[2] = { index, NULL }; | |
648 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file); | |
7198203a SB |
649 | if (launch_editor(git_path(commit_editmsg), NULL, env)) { |
650 | fprintf(stderr, | |
651 | "Please supply the message using either -m or -F option.\n"); | |
652 | exit(1); | |
653 | } | |
ec84bd00 | 654 | } |
f5bbc322 | 655 | |
ec84bd00 PB |
656 | if (!no_verify && |
657 | run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) { | |
658 | return 0; | |
659 | } | |
f5bbc322 | 660 | |
ec84bd00 | 661 | return 1; |
f5bbc322 KH |
662 | } |
663 | ||
664 | /* | |
665 | * Find out if the message starting at position 'start' in the strbuf | |
666 | * contains only whitespace and Signed-off-by lines. | |
667 | */ | |
668 | static int message_is_empty(struct strbuf *sb, int start) | |
669 | { | |
670 | struct strbuf tmpl; | |
671 | const char *nl; | |
672 | int eol, i; | |
673 | ||
5f065737 AR |
674 | if (cleanup_mode == CLEANUP_NONE && sb->len) |
675 | return 0; | |
676 | ||
f5bbc322 KH |
677 | /* See if the template is just a prefix of the message. */ |
678 | strbuf_init(&tmpl, 0); | |
679 | if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) { | |
5f065737 | 680 | stripspace(&tmpl, cleanup_mode == CLEANUP_ALL); |
f5bbc322 KH |
681 | if (start + tmpl.len <= sb->len && |
682 | memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0) | |
683 | start += tmpl.len; | |
684 | } | |
685 | strbuf_release(&tmpl); | |
686 | ||
687 | /* Check if the rest is just whitespace and Signed-of-by's. */ | |
688 | for (i = start; i < sb->len; i++) { | |
689 | nl = memchr(sb->buf + i, '\n', sb->len - i); | |
690 | if (nl) | |
691 | eol = nl - sb->buf; | |
692 | else | |
693 | eol = sb->len; | |
694 | ||
695 | if (strlen(sign_off_header) <= eol - i && | |
696 | !prefixcmp(sb->buf + i, sign_off_header)) { | |
697 | i = eol; | |
698 | continue; | |
699 | } | |
700 | while (i < eol) | |
701 | if (!isspace(sb->buf[i++])) | |
702 | return 0; | |
703 | } | |
704 | ||
705 | return 1; | |
706 | } | |
707 | ||
2f02b25f SB |
708 | static int parse_and_validate_options(int argc, const char *argv[], |
709 | const char * const usage[]) | |
f5bbc322 KH |
710 | { |
711 | int f = 0; | |
712 | ||
2f02b25f | 713 | argc = parse_options(argc, argv, builtin_commit_options, usage, 0); |
f5bbc322 | 714 | |
f9568530 | 715 | if (logfile || message.len || use_message) |
4803466f | 716 | use_editor = 0; |
f5bbc322 | 717 | if (edit_flag) |
4803466f | 718 | use_editor = 1; |
406400ce PB |
719 | if (!use_editor) |
720 | setenv("GIT_EDITOR", ":", 1); | |
f5bbc322 KH |
721 | |
722 | if (get_sha1("HEAD", head_sha1)) | |
723 | initial_commit = 1; | |
724 | ||
725 | if (!get_sha1("MERGE_HEAD", merge_head_sha1)) | |
726 | in_merge = 1; | |
727 | ||
728 | /* Sanity check options */ | |
729 | if (amend && initial_commit) | |
730 | die("You have nothing to amend."); | |
731 | if (amend && in_merge) | |
b5b644a9 | 732 | die("You are in the middle of a merge -- cannot amend."); |
f5bbc322 KH |
733 | |
734 | if (use_message) | |
735 | f++; | |
736 | if (edit_message) | |
737 | f++; | |
738 | if (logfile) | |
739 | f++; | |
740 | if (f > 1) | |
741 | die("Only one of -c/-C/-F can be used."); | |
f9568530 | 742 | if (message.len && f > 0) |
f5bbc322 KH |
743 | die("Option -m cannot be combined with -c/-C/-F."); |
744 | if (edit_message) | |
745 | use_message = edit_message; | |
1eb1e9ee | 746 | if (amend && !use_message) |
f5bbc322 KH |
747 | use_message = "HEAD"; |
748 | if (use_message) { | |
749 | unsigned char sha1[20]; | |
750 | static char utf8[] = "UTF-8"; | |
751 | const char *out_enc; | |
752 | char *enc, *end; | |
753 | struct commit *commit; | |
754 | ||
755 | if (get_sha1(use_message, sha1)) | |
756 | die("could not lookup commit %s", use_message); | |
8a2f8733 | 757 | commit = lookup_commit_reference(sha1); |
f5bbc322 KH |
758 | if (!commit || parse_commit(commit)) |
759 | die("could not parse commit %s", use_message); | |
760 | ||
761 | enc = strstr(commit->buffer, "\nencoding"); | |
762 | if (enc) { | |
763 | end = strchr(enc + 10, '\n'); | |
764 | enc = xstrndup(enc + 10, end - (enc + 10)); | |
765 | } else { | |
766 | enc = utf8; | |
767 | } | |
768 | out_enc = git_commit_encoding ? git_commit_encoding : utf8; | |
769 | ||
770 | if (strcmp(out_enc, enc)) | |
771 | use_message_buffer = | |
772 | reencode_string(commit->buffer, out_enc, enc); | |
773 | ||
774 | /* | |
775 | * If we failed to reencode the buffer, just copy it | |
776 | * byte for byte so the user can try to fix it up. | |
777 | * This also handles the case where input and output | |
778 | * encodings are identical. | |
779 | */ | |
780 | if (use_message_buffer == NULL) | |
781 | use_message_buffer = xstrdup(commit->buffer); | |
782 | if (enc != utf8) | |
783 | free(enc); | |
784 | } | |
785 | ||
786 | if (!!also + !!only + !!all + !!interactive > 1) | |
787 | die("Only one of --include/--only/--all/--interactive can be used."); | |
788 | if (argc == 0 && (also || (only && !amend))) | |
789 | die("No paths with --include/--only does not make sense."); | |
790 | if (argc == 0 && only && amend) | |
791 | only_include_assumed = "Clever... amending the last one with dirty index."; | |
3c5283f8 | 792 | if (argc > 0 && !also && !only) |
f5bbc322 | 793 | only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths..."; |
5f065737 AR |
794 | if (!cleanup_arg || !strcmp(cleanup_arg, "default")) |
795 | cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; | |
796 | else if (!strcmp(cleanup_arg, "verbatim")) | |
797 | cleanup_mode = CLEANUP_NONE; | |
798 | else if (!strcmp(cleanup_arg, "whitespace")) | |
799 | cleanup_mode = CLEANUP_SPACE; | |
800 | else if (!strcmp(cleanup_arg, "strip")) | |
801 | cleanup_mode = CLEANUP_ALL; | |
802 | else | |
803 | die("Invalid cleanup mode %s", cleanup_arg); | |
f5bbc322 | 804 | |
4bfee30a MSO |
805 | if (!untracked_files_arg) |
806 | ; /* default already initialized */ | |
6c2ce048 MSO |
807 | else if (!strcmp(untracked_files_arg, "no")) |
808 | show_untracked_files = SHOW_NO_UNTRACKED_FILES; | |
4bfee30a MSO |
809 | else if (!strcmp(untracked_files_arg, "normal")) |
810 | show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; | |
811 | else if (!strcmp(untracked_files_arg, "all")) | |
812 | show_untracked_files = SHOW_ALL_UNTRACKED_FILES; | |
813 | else | |
814 | die("Invalid untracked files mode '%s'", untracked_files_arg); | |
815 | ||
f5bbc322 KH |
816 | if (all && argc > 0) |
817 | die("Paths with -a does not make sense."); | |
818 | else if (interactive && argc > 0) | |
819 | die("Paths with --interactive does not make sense."); | |
820 | ||
821 | return argc; | |
822 | } | |
823 | ||
824 | int cmd_status(int argc, const char **argv, const char *prefix) | |
825 | { | |
826 | const char *index_file; | |
827 | int commitable; | |
828 | ||
ef90d6d4 | 829 | git_config(git_status_config, NULL); |
f5bbc322 | 830 | |
6b2f2d98 MK |
831 | if (wt_status_use_color == -1) |
832 | wt_status_use_color = git_use_color_default; | |
833 | ||
2f02b25f | 834 | argc = parse_and_validate_options(argc, argv, builtin_status_usage); |
f5bbc322 | 835 | |
f64fe7b4 | 836 | index_file = prepare_index(argc, argv, prefix); |
f5bbc322 | 837 | |
37d07f8f | 838 | commitable = run_status(stdout, index_file, prefix, 0); |
f5bbc322 | 839 | |
2888605c | 840 | rollback_index_files(); |
f5bbc322 KH |
841 | |
842 | return commitable ? 0 : 1; | |
843 | } | |
844 | ||
f5bbc322 KH |
845 | static void print_summary(const char *prefix, const unsigned char *sha1) |
846 | { | |
847 | struct rev_info rev; | |
848 | struct commit *commit; | |
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; | |
4da45bef | 866 | get_commit_format("format:%h: %s", &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 KH |
872 | |
873 | printf("Created %scommit ", initial_commit ? "initial " : ""); | |
874 | ||
bf82a150 JH |
875 | if (!log_tree_commit(&rev, commit)) { |
876 | struct strbuf buf = STRBUF_INIT; | |
877 | format_commit_message(commit, "%h: %s", &buf); | |
878 | printf("%s\n", buf.buf); | |
879 | strbuf_release(&buf); | |
880 | } | |
f5bbc322 KH |
881 | } |
882 | ||
186458b1 | 883 | static int git_commit_config(const char *k, const char *v, void *cb) |
f5bbc322 | 884 | { |
984c6e7e BH |
885 | if (!strcmp(k, "commit.template")) |
886 | return git_config_string(&template_file, k, v); | |
f5bbc322 | 887 | |
ef90d6d4 | 888 | return git_status_config(k, v, cb); |
f5bbc322 KH |
889 | } |
890 | ||
891 | static const char commit_utf8_warn[] = | |
892 | "Warning: commit message does not conform to UTF-8.\n" | |
893 | "You may want to amend it after fixing the message, or set the config\n" | |
894 | "variable i18n.commitencoding to the encoding your project uses.\n"; | |
895 | ||
7c3fd25d LT |
896 | static void add_parent(struct strbuf *sb, const unsigned char *sha1) |
897 | { | |
898 | struct object *obj = parse_object(sha1); | |
899 | const char *parent = sha1_to_hex(sha1); | |
67bfc030 JH |
900 | const char *cp; |
901 | ||
7c3fd25d LT |
902 | if (!obj) |
903 | die("Unable to find commit parent %s", parent); | |
904 | if (obj->type != OBJ_COMMIT) | |
905 | die("Parent %s isn't a proper commit", parent); | |
67bfc030 JH |
906 | |
907 | for (cp = sb->buf; cp && (cp = strstr(cp, "\nparent ")); cp += 8) { | |
908 | if (!memcmp(cp + 8, parent, 40) && cp[48] == '\n') { | |
909 | error("duplicate parent %s ignored", parent); | |
910 | return; | |
911 | } | |
912 | } | |
7c3fd25d LT |
913 | strbuf_addf(sb, "parent %s\n", parent); |
914 | } | |
915 | ||
f5bbc322 KH |
916 | int cmd_commit(int argc, const char **argv, const char *prefix) |
917 | { | |
18abc2db | 918 | int header_len; |
f5bbc322 KH |
919 | struct strbuf sb; |
920 | const char *index_file, *reflog_msg; | |
99a12694 | 921 | char *nl, *p; |
f5bbc322 KH |
922 | unsigned char commit_sha1[20]; |
923 | struct ref_lock *ref_lock; | |
924 | ||
ef90d6d4 | 925 | git_config(git_commit_config, NULL); |
f5bbc322 | 926 | |
2f02b25f | 927 | argc = parse_and_validate_options(argc, argv, builtin_commit_usage); |
f5bbc322 | 928 | |
f64fe7b4 | 929 | index_file = prepare_index(argc, argv, prefix); |
f5bbc322 | 930 | |
ec84bd00 PB |
931 | /* Set up everything for writing the commit object. This includes |
932 | running hooks, writing the trees, and interacting with the user. */ | |
933 | if (!prepare_to_commit(index_file, prefix)) { | |
2888605c | 934 | rollback_index_files(); |
f5bbc322 KH |
935 | return 1; |
936 | } | |
937 | ||
2888605c JH |
938 | /* |
939 | * The commit object | |
940 | */ | |
941 | strbuf_init(&sb, 0); | |
f5bbc322 KH |
942 | strbuf_addf(&sb, "tree %s\n", |
943 | sha1_to_hex(active_cache_tree->sha1)); | |
944 | ||
945 | /* Determine parents */ | |
946 | if (initial_commit) { | |
947 | reflog_msg = "commit (initial)"; | |
f5bbc322 KH |
948 | } else if (amend) { |
949 | struct commit_list *c; | |
950 | struct commit *commit; | |
951 | ||
952 | reflog_msg = "commit (amend)"; | |
953 | commit = lookup_commit(head_sha1); | |
954 | if (!commit || parse_commit(commit)) | |
955 | die("could not parse HEAD commit"); | |
956 | ||
957 | for (c = commit->parents; c; c = c->next) | |
7c3fd25d | 958 | add_parent(&sb, c->item->object.sha1); |
f5bbc322 KH |
959 | } else if (in_merge) { |
960 | struct strbuf m; | |
961 | FILE *fp; | |
962 | ||
963 | reflog_msg = "commit (merge)"; | |
7c3fd25d | 964 | add_parent(&sb, head_sha1); |
f5bbc322 KH |
965 | strbuf_init(&m, 0); |
966 | fp = fopen(git_path("MERGE_HEAD"), "r"); | |
967 | if (fp == NULL) | |
968 | die("could not open %s for reading: %s", | |
969 | git_path("MERGE_HEAD"), strerror(errno)); | |
7c3fd25d LT |
970 | while (strbuf_getline(&m, fp, '\n') != EOF) { |
971 | unsigned char sha1[20]; | |
972 | if (get_sha1_hex(m.buf, sha1) < 0) | |
973 | die("Corrupt MERGE_HEAD file (%s)", m.buf); | |
974 | add_parent(&sb, sha1); | |
975 | } | |
f5bbc322 KH |
976 | fclose(fp); |
977 | strbuf_release(&m); | |
978 | } else { | |
979 | reflog_msg = "commit"; | |
980 | strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1)); | |
981 | } | |
982 | ||
e83dbe80 SB |
983 | strbuf_addf(&sb, "author %s\n", |
984 | fmt_ident(author_name, author_email, author_date, IDENT_ERROR_ON_NO_NAME)); | |
774751a8 | 985 | strbuf_addf(&sb, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME)); |
f5bbc322 KH |
986 | if (!is_encoding_utf8(git_commit_encoding)) |
987 | strbuf_addf(&sb, "encoding %s\n", git_commit_encoding); | |
988 | strbuf_addch(&sb, '\n'); | |
989 | ||
ec84bd00 | 990 | /* Finally, get the commit message */ |
f5bbc322 | 991 | header_len = sb.len; |
740001a5 JH |
992 | if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) { |
993 | rollback_index_files(); | |
994 | die("could not read commit message"); | |
995 | } | |
99a12694 KH |
996 | |
997 | /* Truncate the message just before the diff, if any. */ | |
998 | p = strstr(sb.buf, "\ndiff --git a/"); | |
999 | if (p != NULL) | |
a98b8191 | 1000 | strbuf_setlen(&sb, p - sb.buf + 1); |
99a12694 | 1001 | |
5f065737 AR |
1002 | if (cleanup_mode != CLEANUP_NONE) |
1003 | stripspace(&sb, cleanup_mode == CLEANUP_ALL); | |
2888605c JH |
1004 | if (sb.len < header_len || message_is_empty(&sb, header_len)) { |
1005 | rollback_index_files(); | |
b5b644a9 | 1006 | die("no commit message? aborting commit."); |
2888605c | 1007 | } |
f5bbc322 KH |
1008 | strbuf_addch(&sb, '\0'); |
1009 | if (is_encoding_utf8(git_commit_encoding) && !is_utf8(sb.buf)) | |
1010 | fprintf(stderr, commit_utf8_warn); | |
1011 | ||
2888605c JH |
1012 | if (write_sha1_file(sb.buf, sb.len - 1, commit_type, commit_sha1)) { |
1013 | rollback_index_files(); | |
f5bbc322 | 1014 | die("failed to write commit object"); |
2888605c | 1015 | } |
f5bbc322 KH |
1016 | |
1017 | ref_lock = lock_any_ref_for_update("HEAD", | |
1018 | initial_commit ? NULL : head_sha1, | |
1019 | 0); | |
1020 | ||
1021 | nl = strchr(sb.buf + header_len, '\n'); | |
741707b1 JS |
1022 | if (nl) |
1023 | strbuf_setlen(&sb, nl + 1 - sb.buf); | |
1024 | else | |
1025 | strbuf_addch(&sb, '\n'); | |
1026 | strbuf_remove(&sb, 0, header_len); | |
1027 | strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg)); | |
1028 | strbuf_insert(&sb, strlen(reflog_msg), ": ", 2); | |
f5bbc322 | 1029 | |
2888605c JH |
1030 | if (!ref_lock) { |
1031 | rollback_index_files(); | |
f5bbc322 | 1032 | die("cannot lock HEAD ref"); |
2888605c JH |
1033 | } |
1034 | if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) { | |
1035 | rollback_index_files(); | |
f5bbc322 | 1036 | die("cannot update HEAD ref"); |
2888605c | 1037 | } |
f5bbc322 KH |
1038 | |
1039 | unlink(git_path("MERGE_HEAD")); | |
1040 | unlink(git_path("MERGE_MSG")); | |
5a95b855 | 1041 | unlink(git_path("SQUASH_MSG")); |
f5bbc322 | 1042 | |
5a9dd399 BC |
1043 | if (commit_index_files()) |
1044 | die ("Repository has been updated, but unable to write\n" | |
1045 | "new_index file. Check that disk is not full or quota is\n" | |
1046 | "not exceeded, and then \"git reset HEAD\" to recover."); | |
f5bbc322 KH |
1047 | |
1048 | rerere(); | |
2888605c | 1049 | run_hook(get_index_file(), "post-commit", NULL); |
f5bbc322 KH |
1050 | if (!quiet) |
1051 | print_summary(prefix, commit_sha1); | |
1052 | ||
1053 | return 0; | |
1054 | } |