4 * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
5 * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
9 #include "cache-tree.h"
17 #include "wt-status.h"
18 #include "run-command.h"
23 #include "parse-options.h"
24 #include "string-list.h"
26 #include "unpack-trees.h"
28 static const char * const builtin_commit_usage
[] = {
29 "git commit [options] [--] <filepattern>...",
33 static const char * const builtin_status_usage
[] = {
34 "git status [options] [--] <filepattern>...",
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";
41 static struct lock_file index_lock
; /* real index */
42 static struct lock_file false_lock
; /* used only for partial commits */
49 static const char *logfile
, *force_author
;
50 static const char *template_file
;
51 static char *edit_message
, *use_message
;
52 static char *author_name
, *author_email
, *author_date
;
53 static int all
, edit_flag
, also
, interactive
, only
, amend
, signoff
;
54 static int quiet
, verbose
, no_verify
, allow_empty
;
55 static char *untracked_files_arg
;
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.
68 static char *cleanup_arg
;
70 static int use_editor
= 1, initial_commit
, in_merge
;
71 static const char *only_include_assumed
;
72 static struct strbuf message
;
74 static int opt_parse_m(const struct option
*opt
, const char *arg
, int unset
)
76 struct strbuf
*buf
= opt
->value
;
78 strbuf_setlen(buf
, 0);
80 strbuf_addstr(buf
, arg
);
81 strbuf_addstr(buf
, "\n\n");
86 static struct option builtin_commit_options
[] = {
88 OPT__VERBOSE(&verbose
),
89 OPT_GROUP("Commit message options"),
91 OPT_STRING('F', "file", &logfile
, "FILE", "read log from file"),
92 OPT_STRING(0, "author", &force_author
, "AUTHOR", "override author for commit"),
93 OPT_CALLBACK('m', "message", &message
, "MESSAGE", "specify commit message", opt_parse_m
),
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"),
96 OPT_BOOLEAN('s', "signoff", &signoff
, "add Signed-off-by:"),
97 OPT_STRING('t', "template", &template_file
, "FILE", "use specified template file"),
98 OPT_BOOLEAN('e', "edit", &edit_flag
, "force edit of commit"),
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"),
104 OPT_BOOLEAN('o', "only", &only
, "commit only specified files"),
105 OPT_BOOLEAN('n', "no-verify", &no_verify
, "bypass pre-commit hook"),
106 OPT_BOOLEAN(0, "amend", &amend
, "amend previous commit"),
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" },
108 OPT_BOOLEAN(0, "allow-empty", &allow_empty
, "ok to record an empty change"),
109 OPT_STRING(0, "cleanup", &cleanup_arg
, "default", "how to strip spaces and #comments from message"),
114 static void rollback_index_files(void)
116 switch (commit_style
) {
118 break; /* nothing to do */
120 rollback_lock_file(&index_lock
);
123 rollback_lock_file(&index_lock
);
124 rollback_lock_file(&false_lock
);
129 static int commit_index_files(void)
133 switch (commit_style
) {
135 break; /* nothing to do */
137 err
= commit_lock_file(&index_lock
);
140 err
= commit_lock_file(&index_lock
);
141 rollback_lock_file(&false_lock
);
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.
152 static int list_paths(struct string_list
*list
, const char *with_tree
,
153 const char *prefix
, const char **pattern
)
158 for (i
= 0; pattern
[i
]; i
++)
163 overlay_tree_on_cache(with_tree
, prefix
);
165 for (i
= 0; i
< active_nr
; i
++) {
166 struct cache_entry
*ce
= active_cache
[i
];
167 if (ce
->ce_flags
& CE_UPDATE
)
169 if (!pathspec_match(pattern
, m
, ce
->name
, 0))
171 string_list_insert(ce
->name
, list
);
174 return report_path_error(m
, pattern
, prefix
? strlen(prefix
) : 0);
177 static void add_remove_files(struct string_list
*list
)
180 for (i
= 0; i
< list
->nr
; i
++) {
182 struct string_list_item
*p
= &(list
->items
[i
]);
184 if (!lstat(p
->string
, &st
)) {
185 if (add_to_cache(p
->string
, &st
, 0))
186 die("updating files failed");
188 remove_file_from_cache(p
->string
);
192 static void create_base_index(void)
195 struct unpack_trees_options opts
;
198 if (initial_commit
) {
203 memset(&opts
, 0, sizeof(opts
));
207 opts
.src_index
= &the_index
;
208 opts
.dst_index
= &the_index
;
210 opts
.fn
= oneway_merge
;
211 tree
= parse_tree_indirect(head_sha1
);
213 die("failed to unpack HEAD tree object");
215 init_tree_desc(&t
, tree
->buffer
, tree
->size
);
216 if (unpack_trees(1, &t
, &opts
))
217 exit(128); /* We've already reported the error, finish dying */
220 static char *prepare_index(int argc
, const char **argv
, const char *prefix
)
223 struct string_list partial
;
224 const char **pathspec
= NULL
;
227 interactive_add(argc
, argv
, prefix
);
228 if (read_cache() < 0)
229 die("index file corrupt");
230 commit_style
= COMMIT_AS_IS
;
231 return get_index_file();
234 if (read_cache() < 0)
235 die("index file corrupt");
238 pathspec
= get_pathspec(prefix
, argv
);
241 * Non partial, non as-is commit.
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.
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.
252 if (all
|| (also
&& pathspec
&& *pathspec
)) {
253 int fd
= hold_locked_index(&index_lock
, 1);
254 add_files_to_cache(also
? prefix
: NULL
, pathspec
, 0);
255 refresh_cache(REFRESH_QUIET
);
256 if (write_cache(fd
, active_cache
, active_nr
) ||
257 close_lock_file(&index_lock
))
258 die("unable to write new_index file");
259 commit_style
= COMMIT_NORMAL
;
260 return index_lock
.filename
;
266 * (1) return the name of the real index file.
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.
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
) ||
276 commit_locked_index(&index_lock
))
277 die("unable to write new_index file");
278 commit_style
= COMMIT_AS_IS
;
279 return get_index_file();
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);
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.
301 commit_style
= COMMIT_PARTIAL
;
303 if (file_exists(git_path("MERGE_HEAD")))
304 die("cannot do a partial commit during a merge.");
306 memset(&partial
, 0, sizeof(partial
));
307 partial
.strdup_strings
= 1;
308 if (list_paths(&partial
, initial_commit
? NULL
: "HEAD", prefix
, pathspec
))
312 if (read_cache() < 0)
313 die("cannot read the index");
315 fd
= hold_locked_index(&index_lock
, 1);
316 add_remove_files(&partial
);
317 refresh_cache(REFRESH_QUIET
);
318 if (write_cache(fd
, active_cache
, active_nr
) ||
319 close_lock_file(&index_lock
))
320 die("unable to write new_index file");
322 fd
= hold_lock_file_for_update(&false_lock
,
323 git_path("next-index-%"PRIuMAX
, (uintmax_t) getpid()), 1);
326 add_remove_files(&partial
);
327 refresh_cache(REFRESH_QUIET
);
329 if (write_cache(fd
, active_cache
, active_nr
) ||
330 close_lock_file(&false_lock
))
331 die("unable to write temporary index file");
334 read_cache_from(false_lock
.filename
);
336 return false_lock
.filename
;
339 static int run_status(FILE *fp
, const char *index_file
, const char *prefix
, int nowarn
)
343 wt_status_prepare(&s
);
344 if (wt_status_relative_paths
)
349 s
.reference
= "HEAD^1";
352 s
.untracked
= (show_untracked_files
== SHOW_ALL_UNTRACKED_FILES
);
353 s
.index_file
= index_file
;
362 static int run_hook(const char *index_file
, const char *name
, ...)
364 struct child_process hook
;
365 const char *argv
[10], *env
[2];
366 char index
[PATH_MAX
];
370 va_start(args
, name
);
371 argv
[0] = git_path("hooks/%s", name
);
374 if (++i
>= ARRAY_SIZE(argv
))
375 die ("run_hook(): too many arguments");
376 argv
[i
] = va_arg(args
, const char *);
380 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", index_file
);
384 if (access(argv
[0], X_OK
) < 0)
387 memset(&hook
, 0, sizeof(hook
));
390 hook
.stdout_to_stderr
= 1;
393 return run_command(&hook
);
396 static int is_a_merge(const unsigned char *sha1
)
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
);
404 static const char sign_off_header
[] = "Signed-off-by: ";
406 static void determine_author_info(void)
408 char *name
, *email
, *date
;
410 name
= getenv("GIT_AUTHOR_NAME");
411 email
= getenv("GIT_AUTHOR_EMAIL");
412 date
= getenv("GIT_AUTHOR_DATE");
415 const char *a
, *lb
, *rb
, *eol
;
417 a
= strstr(use_message_buffer
, "\nauthor ");
419 die("invalid commit: %s", use_message
);
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
);
427 name
= xstrndup(a
+ 8, lb
- (a
+ 8));
428 email
= xstrndup(lb
+ 2, rb
- (lb
+ 2));
429 date
= xstrndup(rb
+ 2, eol
- (rb
+ 2));
433 const char *lb
= strstr(force_author
, " <");
434 const char *rb
= strchr(force_author
, '>');
437 die("malformed --author parameter");
438 name
= xstrndup(force_author
, lb
- force_author
);
439 email
= xstrndup(lb
+ 2, rb
- (lb
+ 2));
443 author_email
= email
;
447 static int prepare_to_commit(const char *index_file
, const char *prefix
)
450 int commitable
, saved_color_setting
;
454 const char *hook_arg1
= NULL
;
455 const char *hook_arg2
= NULL
;
458 if (!no_verify
&& run_hook(index_file
, "pre-commit", NULL
))
463 strbuf_addbuf(&sb
, &message
);
464 hook_arg1
= "message";
465 } else if (logfile
&& !strcmp(logfile
, "-")) {
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");
470 hook_arg1
= "message";
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
));
475 hook_arg1
= "message";
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));
481 hook_arg1
= "commit";
482 hook_arg2
= use_message
;
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
));
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
));
490 hook_arg1
= "squash";
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
));
495 hook_arg1
= "template";
499 * This final case does not modify the template message,
500 * it just sets the argument to the prepare-commit-msg hook.
505 fp
= fopen(git_path(commit_editmsg
), "w");
507 die("could not open %s: %s",
508 git_path(commit_editmsg
), strerror(errno
));
510 if (cleanup_mode
!= CLEANUP_NONE
)
517 strbuf_init(&sob
, 0);
518 strbuf_addstr(&sob
, sign_off_header
);
519 strbuf_addstr(&sob
, fmt_name(getenv("GIT_COMMITTER_NAME"),
520 getenv("GIT_COMMITTER_EMAIL")));
521 strbuf_addch(&sob
, '\n');
522 for (i
= sb
.len
- 1; i
> 0 && sb
.buf
[i
- 1] != '\n'; i
--)
524 if (prefixcmp(sb
.buf
+ i
, sob
.buf
)) {
525 if (prefixcmp(sb
.buf
+ i
, sign_off_header
))
526 strbuf_addch(&sb
, '\n');
527 strbuf_addbuf(&sb
, &sob
);
529 strbuf_release(&sob
);
532 if (fwrite(sb
.buf
, 1, sb
.len
, fp
) < sb
.len
)
533 die("could not write commit template: %s", strerror(errno
));
537 determine_author_info();
539 /* This checks if committer ident is explicitly given */
540 git_committer_info(0);
543 const char *committer_ident
;
548 "# It looks like you may be committing a MERGE.\n"
549 "# If this is not correct, please remove the file\n"
553 git_path("MERGE_HEAD"));
557 "# Please enter the commit message for your changes.");
558 if (cleanup_mode
== CLEANUP_ALL
)
561 "# with '#' will be ignored, and an empty"
562 " message aborts the commit.\n");
563 else /* CLEANUP_SPACE, that is. */
566 "# with '#' will be kept; you may remove them"
567 " yourself if you want to.\n"
568 "# An empty message aborts the commit.\n");
569 if (only_include_assumed
)
570 fprintf(fp
, "# %s\n", only_include_assumed
);
572 author_ident
= xstrdup(fmt_name(author_name
, author_email
));
573 committer_ident
= fmt_name(getenv("GIT_COMMITTER_NAME"),
574 getenv("GIT_COMMITTER_EMAIL"));
575 if (strcmp(author_ident
, committer_ident
))
579 ident_shown
++ ? "" : "#\n",
583 if (!user_ident_explicitly_given
)
587 ident_shown
++ ? "" : "#\n",
593 saved_color_setting
= wt_status_use_color
;
594 wt_status_use_color
= 0;
595 commitable
= run_status(fp
, index_file
, prefix
, 1);
596 wt_status_use_color
= saved_color_setting
;
599 unsigned char sha1
[20];
600 const char *parent
= "HEAD";
602 if (!active_nr
&& read_cache() < 0)
603 die("Cannot read index");
608 if (get_sha1(parent
, sha1
))
609 commitable
= !!active_nr
;
611 init_revisions(&rev
, "");
613 setup_revisions(0, NULL
, &rev
, parent
);
614 DIFF_OPT_SET(&rev
.diffopt
, QUIET
);
615 DIFF_OPT_SET(&rev
.diffopt
, EXIT_WITH_STATUS
);
616 run_diff_index(&rev
, 1 /* cached */);
618 commitable
= !!DIFF_OPT_TST(&rev
.diffopt
, HAS_CHANGES
);
624 if (!commitable
&& !in_merge
&& !allow_empty
&&
625 !(amend
&& is_a_merge(head_sha1
))) {
626 run_status(stdout
, index_file
, prefix
, 0);
627 unlink(commit_editmsg
);
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.
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) {
642 error("Error building trees");
646 if (run_hook(index_file
, "prepare-commit-msg",
647 git_path(commit_editmsg
), hook_arg1
, hook_arg2
, NULL
))
651 char index
[PATH_MAX
];
652 const char *env
[2] = { index
, NULL
};
653 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", index_file
);
654 if (launch_editor(git_path(commit_editmsg
), NULL
, env
)) {
656 "Please supply the message using either -m or -F option.\n");
662 run_hook(index_file
, "commit-msg", git_path(commit_editmsg
), NULL
)) {
670 * Find out if the message starting at position 'start' in the strbuf
671 * contains only whitespace and Signed-off-by lines.
673 static int message_is_empty(struct strbuf
*sb
, int start
)
679 if (cleanup_mode
== CLEANUP_NONE
&& sb
->len
)
682 /* See if the template is just a prefix of the message. */
683 strbuf_init(&tmpl
, 0);
684 if (template_file
&& strbuf_read_file(&tmpl
, template_file
, 0) > 0) {
685 stripspace(&tmpl
, cleanup_mode
== CLEANUP_ALL
);
686 if (start
+ tmpl
.len
<= sb
->len
&&
687 memcmp(tmpl
.buf
, sb
->buf
+ start
, tmpl
.len
) == 0)
690 strbuf_release(&tmpl
);
692 /* Check if the rest is just whitespace and Signed-of-by's. */
693 for (i
= start
; i
< sb
->len
; i
++) {
694 nl
= memchr(sb
->buf
+ i
, '\n', sb
->len
- i
);
700 if (strlen(sign_off_header
) <= eol
- i
&&
701 !prefixcmp(sb
->buf
+ i
, sign_off_header
)) {
706 if (!isspace(sb
->buf
[i
++]))
713 static const char *find_author_by_nickname(const char *name
)
715 struct rev_info revs
;
716 struct commit
*commit
;
717 struct strbuf buf
= STRBUF_INIT
;
721 init_revisions(&revs
, NULL
);
722 strbuf_addf(&buf
, "--author=%s", name
);
727 setup_revisions(ac
, av
, &revs
, NULL
);
728 prepare_revision_walk(&revs
);
729 commit
= get_revision(&revs
);
731 strbuf_release(&buf
);
732 format_commit_message(commit
, "%an <%ae>", &buf
, DATE_NORMAL
);
733 return strbuf_detach(&buf
, NULL
);
735 die("No existing author found with '%s'", name
);
738 static int parse_and_validate_options(int argc
, const char *argv
[],
739 const char * const usage
[],
744 argc
= parse_options(argc
, argv
, builtin_commit_options
, usage
, 0);
745 logfile
= parse_options_fix_filename(prefix
, logfile
);
746 template_file
= parse_options_fix_filename(prefix
, template_file
);
748 if (force_author
&& !strchr(force_author
, '>'))
749 force_author
= find_author_by_nickname(force_author
);
751 if (logfile
|| message
.len
|| use_message
)
756 setenv("GIT_EDITOR", ":", 1);
758 if (get_sha1("HEAD", head_sha1
))
761 if (!get_sha1("MERGE_HEAD", merge_head_sha1
))
764 /* Sanity check options */
765 if (amend
&& initial_commit
)
766 die("You have nothing to amend.");
767 if (amend
&& in_merge
)
768 die("You are in the middle of a merge -- cannot amend.");
777 die("Only one of -c/-C/-F can be used.");
778 if (message
.len
&& f
> 0)
779 die("Option -m cannot be combined with -c/-C/-F.");
781 use_message
= edit_message
;
782 if (amend
&& !use_message
)
783 use_message
= "HEAD";
785 unsigned char sha1
[20];
786 static char utf8
[] = "UTF-8";
789 struct commit
*commit
;
791 if (get_sha1(use_message
, sha1
))
792 die("could not lookup commit %s", use_message
);
793 commit
= lookup_commit_reference(sha1
);
794 if (!commit
|| parse_commit(commit
))
795 die("could not parse commit %s", use_message
);
797 enc
= strstr(commit
->buffer
, "\nencoding");
799 end
= strchr(enc
+ 10, '\n');
800 enc
= xstrndup(enc
+ 10, end
- (enc
+ 10));
804 out_enc
= git_commit_encoding
? git_commit_encoding
: utf8
;
806 if (strcmp(out_enc
, enc
))
808 reencode_string(commit
->buffer
, out_enc
, enc
);
811 * If we failed to reencode the buffer, just copy it
812 * byte for byte so the user can try to fix it up.
813 * This also handles the case where input and output
814 * encodings are identical.
816 if (use_message_buffer
== NULL
)
817 use_message_buffer
= xstrdup(commit
->buffer
);
822 if (!!also
+ !!only
+ !!all
+ !!interactive
> 1)
823 die("Only one of --include/--only/--all/--interactive can be used.");
824 if (argc
== 0 && (also
|| (only
&& !amend
)))
825 die("No paths with --include/--only does not make sense.");
826 if (argc
== 0 && only
&& amend
)
827 only_include_assumed
= "Clever... amending the last one with dirty index.";
828 if (argc
> 0 && !also
&& !only
)
829 only_include_assumed
= "Explicit paths specified without -i nor -o; assuming --only paths...";
830 if (!cleanup_arg
|| !strcmp(cleanup_arg
, "default"))
831 cleanup_mode
= use_editor
? CLEANUP_ALL
: CLEANUP_SPACE
;
832 else if (!strcmp(cleanup_arg
, "verbatim"))
833 cleanup_mode
= CLEANUP_NONE
;
834 else if (!strcmp(cleanup_arg
, "whitespace"))
835 cleanup_mode
= CLEANUP_SPACE
;
836 else if (!strcmp(cleanup_arg
, "strip"))
837 cleanup_mode
= CLEANUP_ALL
;
839 die("Invalid cleanup mode %s", cleanup_arg
);
841 if (!untracked_files_arg
)
842 ; /* default already initialized */
843 else if (!strcmp(untracked_files_arg
, "no"))
844 show_untracked_files
= SHOW_NO_UNTRACKED_FILES
;
845 else if (!strcmp(untracked_files_arg
, "normal"))
846 show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
847 else if (!strcmp(untracked_files_arg
, "all"))
848 show_untracked_files
= SHOW_ALL_UNTRACKED_FILES
;
850 die("Invalid untracked files mode '%s'", untracked_files_arg
);
853 die("Paths with -a does not make sense.");
854 else if (interactive
&& argc
> 0)
855 die("Paths with --interactive does not make sense.");
860 int cmd_status(int argc
, const char **argv
, const char *prefix
)
862 const char *index_file
;
865 git_config(git_status_config
, NULL
);
867 if (wt_status_use_color
== -1)
868 wt_status_use_color
= git_use_color_default
;
870 argc
= parse_and_validate_options(argc
, argv
, builtin_status_usage
, prefix
);
872 index_file
= prepare_index(argc
, argv
, prefix
);
874 commitable
= run_status(stdout
, index_file
, prefix
, 0);
876 rollback_index_files();
878 return commitable
? 0 : 1;
881 static void print_summary(const char *prefix
, const unsigned char *sha1
)
884 struct commit
*commit
;
886 commit
= lookup_commit(sha1
);
888 die("couldn't look up newly created commit");
889 if (!commit
|| parse_commit(commit
))
890 die("could not parse newly created commit");
892 init_revisions(&rev
, prefix
);
893 setup_revisions(0, NULL
, &rev
, NULL
);
897 rev
.diffopt
.output_format
=
898 DIFF_FORMAT_SHORTSTAT
| DIFF_FORMAT_SUMMARY
;
900 rev
.verbose_header
= 1;
901 rev
.show_root_diff
= 1;
902 get_commit_format("format:%h: %s", &rev
);
903 rev
.always_show_header
= 0;
904 rev
.diffopt
.detect_rename
= 1;
905 rev
.diffopt
.rename_limit
= 100;
906 rev
.diffopt
.break_opt
= 0;
907 diff_setup_done(&rev
.diffopt
);
909 printf("Created %scommit ", initial_commit
? "initial " : "");
911 if (!log_tree_commit(&rev
, commit
)) {
912 struct strbuf buf
= STRBUF_INIT
;
913 format_commit_message(commit
, "%h: %s", &buf
, DATE_NORMAL
);
914 printf("%s\n", buf
.buf
);
915 strbuf_release(&buf
);
919 static int git_commit_config(const char *k
, const char *v
, void *cb
)
921 if (!strcmp(k
, "commit.template"))
922 return git_config_string(&template_file
, k
, v
);
924 return git_status_config(k
, v
, cb
);
927 static const char commit_utf8_warn
[] =
928 "Warning: commit message does not conform to UTF-8.\n"
929 "You may want to amend it after fixing the message, or set the config\n"
930 "variable i18n.commitencoding to the encoding your project uses.\n";
932 static void add_parent(struct strbuf
*sb
, const unsigned char *sha1
)
934 struct object
*obj
= parse_object(sha1
);
935 const char *parent
= sha1_to_hex(sha1
);
939 die("Unable to find commit parent %s", parent
);
940 if (obj
->type
!= OBJ_COMMIT
)
941 die("Parent %s isn't a proper commit", parent
);
943 for (cp
= sb
->buf
; cp
&& (cp
= strstr(cp
, "\nparent ")); cp
+= 8) {
944 if (!memcmp(cp
+ 8, parent
, 40) && cp
[48] == '\n') {
945 error("duplicate parent %s ignored", parent
);
949 strbuf_addf(sb
, "parent %s\n", parent
);
952 int cmd_commit(int argc
, const char **argv
, const char *prefix
)
956 const char *index_file
, *reflog_msg
;
958 unsigned char commit_sha1
[20];
959 struct ref_lock
*ref_lock
;
961 git_config(git_commit_config
, NULL
);
963 argc
= parse_and_validate_options(argc
, argv
, builtin_commit_usage
, prefix
);
965 index_file
= prepare_index(argc
, argv
, prefix
);
967 /* Set up everything for writing the commit object. This includes
968 running hooks, writing the trees, and interacting with the user. */
969 if (!prepare_to_commit(index_file
, prefix
)) {
970 rollback_index_files();
978 strbuf_addf(&sb
, "tree %s\n",
979 sha1_to_hex(active_cache_tree
->sha1
));
981 /* Determine parents */
982 if (initial_commit
) {
983 reflog_msg
= "commit (initial)";
985 struct commit_list
*c
;
986 struct commit
*commit
;
988 reflog_msg
= "commit (amend)";
989 commit
= lookup_commit(head_sha1
);
990 if (!commit
|| parse_commit(commit
))
991 die("could not parse HEAD commit");
993 for (c
= commit
->parents
; c
; c
= c
->next
)
994 add_parent(&sb
, c
->item
->object
.sha1
);
995 } else if (in_merge
) {
999 reflog_msg
= "commit (merge)";
1000 add_parent(&sb
, head_sha1
);
1002 fp
= fopen(git_path("MERGE_HEAD"), "r");
1004 die("could not open %s for reading: %s",
1005 git_path("MERGE_HEAD"), strerror(errno
));
1006 while (strbuf_getline(&m
, fp
, '\n') != EOF
) {
1007 unsigned char sha1
[20];
1008 if (get_sha1_hex(m
.buf
, sha1
) < 0)
1009 die("Corrupt MERGE_HEAD file (%s)", m
.buf
);
1010 add_parent(&sb
, sha1
);
1015 reflog_msg
= "commit";
1016 strbuf_addf(&sb
, "parent %s\n", sha1_to_hex(head_sha1
));
1019 strbuf_addf(&sb
, "author %s\n",
1020 fmt_ident(author_name
, author_email
, author_date
, IDENT_ERROR_ON_NO_NAME
));
1021 strbuf_addf(&sb
, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME
));
1022 if (!is_encoding_utf8(git_commit_encoding
))
1023 strbuf_addf(&sb
, "encoding %s\n", git_commit_encoding
);
1024 strbuf_addch(&sb
, '\n');
1026 /* Finally, get the commit message */
1027 header_len
= sb
.len
;
1028 if (strbuf_read_file(&sb
, git_path(commit_editmsg
), 0) < 0) {
1029 rollback_index_files();
1030 die("could not read commit message");
1033 /* Truncate the message just before the diff, if any. */
1034 p
= strstr(sb
.buf
, "\ndiff --git a/");
1036 strbuf_setlen(&sb
, p
- sb
.buf
+ 1);
1038 if (cleanup_mode
!= CLEANUP_NONE
)
1039 stripspace(&sb
, cleanup_mode
== CLEANUP_ALL
);
1040 if (sb
.len
< header_len
|| message_is_empty(&sb
, header_len
)) {
1041 rollback_index_files();
1042 fprintf(stderr
, "Aborting commit due to empty commit message.\n");
1045 strbuf_addch(&sb
, '\0');
1046 if (is_encoding_utf8(git_commit_encoding
) && !is_utf8(sb
.buf
))
1047 fprintf(stderr
, commit_utf8_warn
);
1049 if (write_sha1_file(sb
.buf
, sb
.len
- 1, commit_type
, commit_sha1
)) {
1050 rollback_index_files();
1051 die("failed to write commit object");
1054 ref_lock
= lock_any_ref_for_update("HEAD",
1055 initial_commit
? NULL
: head_sha1
,
1058 nl
= strchr(sb
.buf
+ header_len
, '\n');
1060 strbuf_setlen(&sb
, nl
+ 1 - sb
.buf
);
1062 strbuf_addch(&sb
, '\n');
1063 strbuf_remove(&sb
, 0, header_len
);
1064 strbuf_insert(&sb
, 0, reflog_msg
, strlen(reflog_msg
));
1065 strbuf_insert(&sb
, strlen(reflog_msg
), ": ", 2);
1068 rollback_index_files();
1069 die("cannot lock HEAD ref");
1071 if (write_ref_sha1(ref_lock
, commit_sha1
, sb
.buf
) < 0) {
1072 rollback_index_files();
1073 die("cannot update HEAD ref");
1076 unlink(git_path("MERGE_HEAD"));
1077 unlink(git_path("MERGE_MSG"));
1078 unlink(git_path("SQUASH_MSG"));
1080 if (commit_index_files())
1081 die ("Repository has been updated, but unable to write\n"
1082 "new_index file. Check that disk is not full or quota is\n"
1083 "not exceeded, and then \"git reset HEAD\" to recover.");
1086 run_hook(get_index_file(), "post-commit", NULL
);
1088 print_summary(prefix
, commit_sha1
);