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"
29 static const char * const builtin_commit_usage
[] = {
30 "git commit [options] [--] <filepattern>...",
34 static const char * const builtin_status_usage
[] = {
35 "git status [options] [--] <filepattern>...",
39 static unsigned char head_sha1
[20], merge_head_sha1
[20];
40 static char *use_message_buffer
;
41 static const char commit_editmsg
[] = "COMMIT_EDITMSG";
42 static struct lock_file index_lock
; /* real index */
43 static struct lock_file false_lock
; /* used only for partial commits */
50 static const char *logfile
, *force_author
;
51 static const char *template_file
;
52 static char *edit_message
, *use_message
;
53 static char *author_name
, *author_email
, *author_date
;
54 static int all
, edit_flag
, also
, interactive
, only
, amend
, signoff
;
55 static int quiet
, verbose
, no_verify
, allow_empty
, dry_run
;
56 static char *untracked_files_arg
;
58 * The default commit message cleanup mode will remove the lines
59 * beginning with # (shell comments) and leading and trailing
60 * whitespaces (empty lines or containing only whitespaces)
61 * if editor is used, and only the whitespaces if the message
62 * is specified explicitly.
69 static char *cleanup_arg
;
71 static int use_editor
= 1, initial_commit
, in_merge
;
72 static const char *only_include_assumed
;
73 static struct strbuf message
;
75 static int opt_parse_m(const struct option
*opt
, const char *arg
, int unset
)
77 struct strbuf
*buf
= opt
->value
;
79 strbuf_setlen(buf
, 0);
81 strbuf_addstr(buf
, arg
);
82 strbuf_addstr(buf
, "\n\n");
87 static struct option builtin_commit_options
[] = {
89 OPT__VERBOSE(&verbose
),
90 OPT_GROUP("Commit message options"),
92 OPT_FILENAME('F', "file", &logfile
, "read log from file"),
93 OPT_STRING(0, "author", &force_author
, "AUTHOR", "override author for commit"),
94 OPT_CALLBACK('m', "message", &message
, "MESSAGE", "specify commit message", opt_parse_m
),
95 OPT_STRING('c', "reedit-message", &edit_message
, "COMMIT", "reuse and edit message from specified commit "),
96 OPT_STRING('C', "reuse-message", &use_message
, "COMMIT", "reuse message from specified commit"),
97 OPT_BOOLEAN('s', "signoff", &signoff
, "add Signed-off-by:"),
98 OPT_FILENAME('t', "template", &template_file
, "use specified template file"),
99 OPT_BOOLEAN('e', "edit", &edit_flag
, "force edit of commit"),
101 OPT_GROUP("Commit contents options"),
102 OPT_BOOLEAN('a', "all", &all
, "commit all changed files"),
103 OPT_BOOLEAN('i', "include", &also
, "add specified files to index for commit"),
104 OPT_BOOLEAN(0, "interactive", &interactive
, "interactively add files"),
105 OPT_BOOLEAN('o', "only", &only
, "commit only specified files"),
106 OPT_BOOLEAN('n', "no-verify", &no_verify
, "bypass pre-commit hook"),
107 OPT_BOOLEAN(0, "dry-run", &dry_run
, "show what would be committed"),
108 OPT_BOOLEAN(0, "amend", &amend
, "amend previous commit"),
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" },
110 OPT_BOOLEAN(0, "allow-empty", &allow_empty
, "ok to record an empty change"),
111 OPT_STRING(0, "cleanup", &cleanup_arg
, "default", "how to strip spaces and #comments from message"),
116 static void rollback_index_files(void)
118 switch (commit_style
) {
120 break; /* nothing to do */
122 rollback_lock_file(&index_lock
);
125 rollback_lock_file(&index_lock
);
126 rollback_lock_file(&false_lock
);
131 static int commit_index_files(void)
135 switch (commit_style
) {
137 break; /* nothing to do */
139 err
= commit_lock_file(&index_lock
);
142 err
= commit_lock_file(&index_lock
);
143 rollback_lock_file(&false_lock
);
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.
154 static int list_paths(struct string_list
*list
, const char *with_tree
,
155 const char *prefix
, const char **pattern
)
160 for (i
= 0; pattern
[i
]; i
++)
165 overlay_tree_on_cache(with_tree
, prefix
);
167 for (i
= 0; i
< active_nr
; i
++) {
168 struct cache_entry
*ce
= active_cache
[i
];
169 if (ce
->ce_flags
& CE_UPDATE
)
171 if (!match_pathspec(pattern
, ce
->name
, ce_namelen(ce
), 0, m
))
173 string_list_insert(ce
->name
, list
);
176 return report_path_error(m
, pattern
, prefix
? strlen(prefix
) : 0);
179 static void add_remove_files(struct string_list
*list
)
182 for (i
= 0; i
< list
->nr
; i
++) {
184 struct string_list_item
*p
= &(list
->items
[i
]);
186 if (!lstat(p
->string
, &st
)) {
187 if (add_to_cache(p
->string
, &st
, 0))
188 die("updating files failed");
190 remove_file_from_cache(p
->string
);
194 static void create_base_index(void)
197 struct unpack_trees_options opts
;
200 if (initial_commit
) {
205 memset(&opts
, 0, sizeof(opts
));
209 opts
.src_index
= &the_index
;
210 opts
.dst_index
= &the_index
;
212 opts
.fn
= oneway_merge
;
213 tree
= parse_tree_indirect(head_sha1
);
215 die("failed to unpack HEAD tree object");
217 init_tree_desc(&t
, tree
->buffer
, tree
->size
);
218 if (unpack_trees(1, &t
, &opts
))
219 exit(128); /* We've already reported the error, finish dying */
222 static char *prepare_index(int argc
, const char **argv
, const char *prefix
, int is_status
)
225 struct string_list partial
;
226 const char **pathspec
= NULL
;
227 int refresh_flags
= REFRESH_QUIET
;
230 refresh_flags
|= REFRESH_UNMERGED
;
232 if (interactive_add(argc
, argv
, prefix
) != 0)
233 die("interactive add failed");
234 if (read_cache_preload(NULL
) < 0)
235 die("index file corrupt");
236 commit_style
= COMMIT_AS_IS
;
237 return get_index_file();
241 pathspec
= get_pathspec(prefix
, argv
);
243 if (read_cache_preload(pathspec
) < 0)
244 die("index file corrupt");
247 * Non partial, non as-is commit.
249 * (1) get the real index;
250 * (2) update the_index as necessary;
251 * (3) write the_index out to the real index (still locked);
252 * (4) return the name of the locked index file.
254 * The caller should run hooks on the locked real index, and
255 * (A) if all goes well, commit the real index;
256 * (B) on failure, rollback the real index.
258 if (all
|| (also
&& pathspec
&& *pathspec
)) {
259 int fd
= hold_locked_index(&index_lock
, 1);
260 add_files_to_cache(also
? prefix
: NULL
, pathspec
, 0);
261 refresh_cache(refresh_flags
);
262 if (write_cache(fd
, active_cache
, active_nr
) ||
263 close_lock_file(&index_lock
))
264 die("unable to write new_index file");
265 commit_style
= COMMIT_NORMAL
;
266 return index_lock
.filename
;
272 * (1) return the name of the real index file.
274 * The caller should run hooks on the real index, and run
275 * hooks on the real index, and create commit from the_index.
276 * We still need to refresh the index here.
278 if (!pathspec
|| !*pathspec
) {
279 fd
= hold_locked_index(&index_lock
, 1);
280 refresh_cache(refresh_flags
);
281 if (write_cache(fd
, active_cache
, active_nr
) ||
282 commit_locked_index(&index_lock
))
283 die("unable to write new_index file");
284 commit_style
= COMMIT_AS_IS
;
285 return get_index_file();
291 * (0) find the set of affected paths;
292 * (1) get lock on the real index file;
293 * (2) update the_index with the given paths;
294 * (3) write the_index out to the real index (still locked);
295 * (4) get lock on the false index file;
296 * (5) reset the_index from HEAD;
297 * (6) update the_index the same way as (2);
298 * (7) write the_index out to the false index file;
299 * (8) return the name of the false index file (still locked);
301 * The caller should run hooks on the locked false index, and
302 * create commit from it. Then
303 * (A) if all goes well, commit the real index;
304 * (B) on failure, rollback the real index;
305 * In either case, rollback the false index.
307 commit_style
= COMMIT_PARTIAL
;
309 if (file_exists(git_path("MERGE_HEAD")))
310 die("cannot do a partial commit during a merge.");
312 memset(&partial
, 0, sizeof(partial
));
313 partial
.strdup_strings
= 1;
314 if (list_paths(&partial
, initial_commit
? NULL
: "HEAD", prefix
, pathspec
))
318 if (read_cache() < 0)
319 die("cannot read the index");
321 fd
= hold_locked_index(&index_lock
, 1);
322 add_remove_files(&partial
);
323 refresh_cache(REFRESH_QUIET
);
324 if (write_cache(fd
, active_cache
, active_nr
) ||
325 close_lock_file(&index_lock
))
326 die("unable to write new_index file");
328 fd
= hold_lock_file_for_update(&false_lock
,
329 git_path("next-index-%"PRIuMAX
,
330 (uintmax_t) getpid()),
334 add_remove_files(&partial
);
335 refresh_cache(REFRESH_QUIET
);
337 if (write_cache(fd
, active_cache
, active_nr
) ||
338 close_lock_file(&false_lock
))
339 die("unable to write temporary index file");
342 read_cache_from(false_lock
.filename
);
344 return false_lock
.filename
;
347 static int run_status(FILE *fp
, const char *index_file
, const char *prefix
, int nowarn
,
350 unsigned char sha1
[20];
352 if (s
->relative_paths
)
357 s
->reference
= "HEAD^1";
359 s
->verbose
= verbose
;
360 s
->index_file
= index_file
;
363 s
->is_initial
= get_sha1(s
->reference
, sha1
) ? 1 : 0;
365 wt_status_collect(s
);
368 return s
->commitable
;
371 static int is_a_merge(const unsigned char *sha1
)
373 struct commit
*commit
= lookup_commit(sha1
);
374 if (!commit
|| parse_commit(commit
))
375 die("could not parse HEAD commit");
376 return !!(commit
->parents
&& commit
->parents
->next
);
379 static const char sign_off_header
[] = "Signed-off-by: ";
381 static void determine_author_info(void)
383 char *name
, *email
, *date
;
385 name
= getenv("GIT_AUTHOR_NAME");
386 email
= getenv("GIT_AUTHOR_EMAIL");
387 date
= getenv("GIT_AUTHOR_DATE");
390 const char *a
, *lb
, *rb
, *eol
;
392 a
= strstr(use_message_buffer
, "\nauthor ");
394 die("invalid commit: %s", use_message
);
396 lb
= strstr(a
+ 8, " <");
397 rb
= strstr(a
+ 8, "> ");
398 eol
= strchr(a
+ 8, '\n');
399 if (!lb
|| !rb
|| !eol
)
400 die("invalid commit: %s", use_message
);
402 name
= xstrndup(a
+ 8, lb
- (a
+ 8));
403 email
= xstrndup(lb
+ 2, rb
- (lb
+ 2));
404 date
= xstrndup(rb
+ 2, eol
- (rb
+ 2));
408 const char *lb
= strstr(force_author
, " <");
409 const char *rb
= strchr(force_author
, '>');
412 die("malformed --author parameter");
413 name
= xstrndup(force_author
, lb
- force_author
);
414 email
= xstrndup(lb
+ 2, rb
- (lb
+ 2));
418 author_email
= email
;
422 static int prepare_to_commit(const char *index_file
, const char *prefix
,
426 int commitable
, saved_color_setting
;
427 struct strbuf sb
= STRBUF_INIT
;
430 const char *hook_arg1
= NULL
;
431 const char *hook_arg2
= NULL
;
434 if (!no_verify
&& run_hook(index_file
, "pre-commit", NULL
))
438 strbuf_addbuf(&sb
, &message
);
439 hook_arg1
= "message";
440 } else if (logfile
&& !strcmp(logfile
, "-")) {
442 fprintf(stderr
, "(reading log message from standard input)\n");
443 if (strbuf_read(&sb
, 0, 0) < 0)
444 die_errno("could not read log from standard input");
445 hook_arg1
= "message";
446 } else if (logfile
) {
447 if (strbuf_read_file(&sb
, logfile
, 0) < 0)
448 die_errno("could not read log file '%s'",
450 hook_arg1
= "message";
451 } else if (use_message
) {
452 buffer
= strstr(use_message_buffer
, "\n\n");
453 if (!buffer
|| buffer
[2] == '\0')
454 die("commit has empty message");
455 strbuf_add(&sb
, buffer
+ 2, strlen(buffer
+ 2));
456 hook_arg1
= "commit";
457 hook_arg2
= use_message
;
458 } else if (!stat(git_path("MERGE_MSG"), &statbuf
)) {
459 if (strbuf_read_file(&sb
, git_path("MERGE_MSG"), 0) < 0)
460 die_errno("could not read MERGE_MSG");
462 } else if (!stat(git_path("SQUASH_MSG"), &statbuf
)) {
463 if (strbuf_read_file(&sb
, git_path("SQUASH_MSG"), 0) < 0)
464 die_errno("could not read SQUASH_MSG");
465 hook_arg1
= "squash";
466 } else if (template_file
&& !stat(template_file
, &statbuf
)) {
467 if (strbuf_read_file(&sb
, template_file
, 0) < 0)
468 die_errno("could not read '%s'", template_file
);
469 hook_arg1
= "template";
473 * This final case does not modify the template message,
474 * it just sets the argument to the prepare-commit-msg hook.
479 fp
= fopen(git_path(commit_editmsg
), "w");
481 die_errno("could not open '%s'", git_path(commit_editmsg
));
483 if (cleanup_mode
!= CLEANUP_NONE
)
487 struct strbuf sob
= STRBUF_INIT
;
490 strbuf_addstr(&sob
, sign_off_header
);
491 strbuf_addstr(&sob
, fmt_name(getenv("GIT_COMMITTER_NAME"),
492 getenv("GIT_COMMITTER_EMAIL")));
493 strbuf_addch(&sob
, '\n');
494 for (i
= sb
.len
- 1; i
> 0 && sb
.buf
[i
- 1] != '\n'; i
--)
496 if (prefixcmp(sb
.buf
+ i
, sob
.buf
)) {
497 if (prefixcmp(sb
.buf
+ i
, sign_off_header
))
498 strbuf_addch(&sb
, '\n');
499 strbuf_addbuf(&sb
, &sob
);
501 strbuf_release(&sob
);
504 if (fwrite(sb
.buf
, 1, sb
.len
, fp
) < sb
.len
)
505 die_errno("could not write commit template");
509 determine_author_info();
511 /* This checks if committer ident is explicitly given */
512 git_committer_info(0);
515 const char *committer_ident
;
520 "# It looks like you may be committing a MERGE.\n"
521 "# If this is not correct, please remove the file\n"
525 git_path("MERGE_HEAD"));
529 "# Please enter the commit message for your changes.");
530 if (cleanup_mode
== CLEANUP_ALL
)
533 "# with '#' will be ignored, and an empty"
534 " message aborts the commit.\n");
535 else /* CLEANUP_SPACE, that is. */
538 "# with '#' will be kept; you may remove them"
539 " yourself if you want to.\n"
540 "# An empty message aborts the commit.\n");
541 if (only_include_assumed
)
542 fprintf(fp
, "# %s\n", only_include_assumed
);
544 author_ident
= xstrdup(fmt_name(author_name
, author_email
));
545 committer_ident
= fmt_name(getenv("GIT_COMMITTER_NAME"),
546 getenv("GIT_COMMITTER_EMAIL"));
547 if (strcmp(author_ident
, committer_ident
))
551 ident_shown
++ ? "" : "#\n",
555 if (!user_ident_explicitly_given
)
559 ident_shown
++ ? "" : "#\n",
565 saved_color_setting
= s
->use_color
;
567 commitable
= run_status(fp
, index_file
, prefix
, 1, s
);
568 s
->use_color
= saved_color_setting
;
570 unsigned char sha1
[20];
571 const char *parent
= "HEAD";
573 if (!active_nr
&& read_cache() < 0)
574 die("Cannot read index");
579 if (get_sha1(parent
, sha1
))
580 commitable
= !!active_nr
;
582 commitable
= index_differs_from(parent
, 0);
587 if (!commitable
&& !in_merge
&& !allow_empty
&&
588 !(amend
&& is_a_merge(head_sha1
))) {
589 run_status(stdout
, index_file
, prefix
, 0, s
);
594 * Re-read the index as pre-commit hook could have updated it,
595 * and write it out as a tree. We must do this before we invoke
596 * the editor and after we invoke run_status above.
599 read_cache_from(index_file
);
600 if (!active_cache_tree
)
601 active_cache_tree
= cache_tree();
602 if (cache_tree_update(active_cache_tree
,
603 active_cache
, active_nr
, 0, 0) < 0) {
604 error("Error building trees");
608 if (run_hook(index_file
, "prepare-commit-msg",
609 git_path(commit_editmsg
), hook_arg1
, hook_arg2
, NULL
))
613 char index
[PATH_MAX
];
614 const char *env
[2] = { index
, NULL
};
615 snprintf(index
, sizeof(index
), "GIT_INDEX_FILE=%s", index_file
);
616 if (launch_editor(git_path(commit_editmsg
), NULL
, env
)) {
618 "Please supply the message using either -m or -F option.\n");
624 run_hook(index_file
, "commit-msg", git_path(commit_editmsg
), NULL
)) {
632 * Find out if the message in the strbuf contains only whitespace and
633 * Signed-off-by lines.
635 static int message_is_empty(struct strbuf
*sb
)
637 struct strbuf tmpl
= STRBUF_INIT
;
639 int eol
, i
, start
= 0;
641 if (cleanup_mode
== CLEANUP_NONE
&& sb
->len
)
644 /* See if the template is just a prefix of the message. */
645 if (template_file
&& strbuf_read_file(&tmpl
, template_file
, 0) > 0) {
646 stripspace(&tmpl
, cleanup_mode
== CLEANUP_ALL
);
647 if (start
+ tmpl
.len
<= sb
->len
&&
648 memcmp(tmpl
.buf
, sb
->buf
+ start
, tmpl
.len
) == 0)
651 strbuf_release(&tmpl
);
653 /* Check if the rest is just whitespace and Signed-of-by's. */
654 for (i
= start
; i
< sb
->len
; i
++) {
655 nl
= memchr(sb
->buf
+ i
, '\n', sb
->len
- i
);
661 if (strlen(sign_off_header
) <= eol
- i
&&
662 !prefixcmp(sb
->buf
+ i
, sign_off_header
)) {
667 if (!isspace(sb
->buf
[i
++]))
674 static const char *find_author_by_nickname(const char *name
)
676 struct rev_info revs
;
677 struct commit
*commit
;
678 struct strbuf buf
= STRBUF_INIT
;
682 init_revisions(&revs
, NULL
);
683 strbuf_addf(&buf
, "--author=%s", name
);
688 setup_revisions(ac
, av
, &revs
, NULL
);
689 prepare_revision_walk(&revs
);
690 commit
= get_revision(&revs
);
692 strbuf_release(&buf
);
693 format_commit_message(commit
, "%an <%ae>", &buf
, DATE_NORMAL
);
694 return strbuf_detach(&buf
, NULL
);
696 die("No existing author found with '%s'", name
);
700 static void handle_untracked_files_arg(struct wt_status
*s
)
702 if (!untracked_files_arg
)
703 ; /* default already initialized */
704 else if (!strcmp(untracked_files_arg
, "no"))
705 s
->show_untracked_files
= SHOW_NO_UNTRACKED_FILES
;
706 else if (!strcmp(untracked_files_arg
, "normal"))
707 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
708 else if (!strcmp(untracked_files_arg
, "all"))
709 s
->show_untracked_files
= SHOW_ALL_UNTRACKED_FILES
;
711 die("Invalid untracked files mode '%s'", untracked_files_arg
);
714 static int parse_and_validate_options(int argc
, const char *argv
[],
715 const char * const usage
[],
721 argc
= parse_options(argc
, argv
, prefix
, builtin_commit_options
, usage
,
724 if (force_author
&& !strchr(force_author
, '>'))
725 force_author
= find_author_by_nickname(force_author
);
727 if (logfile
|| message
.len
|| use_message
)
732 setenv("GIT_EDITOR", ":", 1);
734 if (get_sha1("HEAD", head_sha1
))
737 if (!get_sha1("MERGE_HEAD", merge_head_sha1
))
740 /* Sanity check options */
741 if (amend
&& initial_commit
)
742 die("You have nothing to amend.");
743 if (amend
&& in_merge
)
744 die("You are in the middle of a merge -- cannot amend.");
753 die("Only one of -c/-C/-F can be used.");
754 if (message
.len
&& f
> 0)
755 die("Option -m cannot be combined with -c/-C/-F.");
757 use_message
= edit_message
;
758 if (amend
&& !use_message
)
759 use_message
= "HEAD";
761 unsigned char sha1
[20];
762 static char utf8
[] = "UTF-8";
765 struct commit
*commit
;
767 if (get_sha1(use_message
, sha1
))
768 die("could not lookup commit %s", use_message
);
769 commit
= lookup_commit_reference(sha1
);
770 if (!commit
|| parse_commit(commit
))
771 die("could not parse commit %s", use_message
);
773 enc
= strstr(commit
->buffer
, "\nencoding");
775 end
= strchr(enc
+ 10, '\n');
776 enc
= xstrndup(enc
+ 10, end
- (enc
+ 10));
780 out_enc
= git_commit_encoding
? git_commit_encoding
: utf8
;
782 if (strcmp(out_enc
, enc
))
784 reencode_string(commit
->buffer
, out_enc
, enc
);
787 * If we failed to reencode the buffer, just copy it
788 * byte for byte so the user can try to fix it up.
789 * This also handles the case where input and output
790 * encodings are identical.
792 if (use_message_buffer
== NULL
)
793 use_message_buffer
= xstrdup(commit
->buffer
);
798 if (!!also
+ !!only
+ !!all
+ !!interactive
> 1)
799 die("Only one of --include/--only/--all/--interactive can be used.");
800 if (argc
== 0 && (also
|| (only
&& !amend
)))
801 die("No paths with --include/--only does not make sense.");
802 if (argc
== 0 && only
&& amend
)
803 only_include_assumed
= "Clever... amending the last one with dirty index.";
804 if (argc
> 0 && !also
&& !only
)
805 only_include_assumed
= "Explicit paths specified without -i nor -o; assuming --only paths...";
806 if (!cleanup_arg
|| !strcmp(cleanup_arg
, "default"))
807 cleanup_mode
= use_editor
? CLEANUP_ALL
: CLEANUP_SPACE
;
808 else if (!strcmp(cleanup_arg
, "verbatim"))
809 cleanup_mode
= CLEANUP_NONE
;
810 else if (!strcmp(cleanup_arg
, "whitespace"))
811 cleanup_mode
= CLEANUP_SPACE
;
812 else if (!strcmp(cleanup_arg
, "strip"))
813 cleanup_mode
= CLEANUP_ALL
;
815 die("Invalid cleanup mode %s", cleanup_arg
);
817 handle_untracked_files_arg(s
);
820 die("Paths with -a does not make sense.");
821 else if (interactive
&& argc
> 0)
822 die("Paths with --interactive does not make sense.");
827 static int dry_run_commit(int argc
, const char **argv
, const char *prefix
,
831 const char *index_file
;
833 index_file
= prepare_index(argc
, argv
, prefix
, 1);
834 commitable
= run_status(stdout
, index_file
, prefix
, 0, s
);
835 rollback_index_files();
837 return commitable
? 0 : 1;
840 static int parse_status_slot(const char *var
, int offset
)
842 if (!strcasecmp(var
+offset
, "header"))
843 return WT_STATUS_HEADER
;
844 if (!strcasecmp(var
+offset
, "updated")
845 || !strcasecmp(var
+offset
, "added"))
846 return WT_STATUS_UPDATED
;
847 if (!strcasecmp(var
+offset
, "changed"))
848 return WT_STATUS_CHANGED
;
849 if (!strcasecmp(var
+offset
, "untracked"))
850 return WT_STATUS_UNTRACKED
;
851 if (!strcasecmp(var
+offset
, "nobranch"))
852 return WT_STATUS_NOBRANCH
;
853 if (!strcasecmp(var
+offset
, "unmerged"))
854 return WT_STATUS_UNMERGED
;
855 die("bad config variable '%s'", var
);
858 static int git_status_config(const char *k
, const char *v
, void *cb
)
860 struct wt_status
*s
= cb
;
862 if (!strcmp(k
, "status.submodulesummary")) {
864 s
->submodule_summary
= git_config_bool_or_int(k
, v
, &is_bool
);
865 if (is_bool
&& s
->submodule_summary
)
866 s
->submodule_summary
= -1;
869 if (!strcmp(k
, "status.color") || !strcmp(k
, "color.status")) {
870 s
->use_color
= git_config_colorbool(k
, v
, -1);
873 if (!prefixcmp(k
, "status.color.") || !prefixcmp(k
, "color.status.")) {
874 int slot
= parse_status_slot(k
, 13);
876 return config_error_nonbool(k
);
877 color_parse(v
, k
, s
->color_palette
[slot
]);
880 if (!strcmp(k
, "status.relativepaths")) {
881 s
->relative_paths
= git_config_bool(k
, v
);
884 if (!strcmp(k
, "status.showuntrackedfiles")) {
886 return config_error_nonbool(k
);
887 else if (!strcmp(v
, "no"))
888 s
->show_untracked_files
= SHOW_NO_UNTRACKED_FILES
;
889 else if (!strcmp(v
, "normal"))
890 s
->show_untracked_files
= SHOW_NORMAL_UNTRACKED_FILES
;
891 else if (!strcmp(v
, "all"))
892 s
->show_untracked_files
= SHOW_ALL_UNTRACKED_FILES
;
894 return error("Invalid untracked files mode '%s'", v
);
897 return git_diff_ui_config(k
, v
, NULL
);
900 #define quote_path quote_path_relative
902 static void short_unmerged(int null_termination
, struct string_list_item
*it
,
905 struct wt_status_change_data
*d
= it
->util
;
906 const char *how
= "??";
908 switch (d
->stagemask
) {
909 case 1: how
= "DD"; break; /* both deleted */
910 case 2: how
= "AU"; break; /* added by us */
911 case 3: how
= "UD"; break; /* deleted by them */
912 case 4: how
= "UA"; break; /* added by them */
913 case 5: how
= "DU"; break; /* deleted by us */
914 case 6: how
= "AA"; break; /* both added */
915 case 7: how
= "UU"; break; /* both modified */
918 if (null_termination
) {
919 fprintf(stdout
, "%s%c", it
->string
, 0);
921 struct strbuf onebuf
= STRBUF_INIT
;
923 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
925 strbuf_release(&onebuf
);
929 static void short_status(int null_termination
, struct string_list_item
*it
,
932 struct wt_status_change_data
*d
= it
->util
;
935 !d
->index_status
? ' ' : d
->index_status
,
936 !d
->worktree_status
? ' ' : d
->worktree_status
);
937 if (null_termination
) {
938 fprintf(stdout
, "%s%c", it
->string
, 0);
940 fprintf(stdout
, "%s%c", d
->head_path
, 0);
942 struct strbuf onebuf
= STRBUF_INIT
;
945 one
= quote_path(d
->head_path
, -1, &onebuf
, s
->prefix
);
946 printf("%s -> ", one
);
947 strbuf_release(&onebuf
);
949 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
951 strbuf_release(&onebuf
);
955 static void short_untracked(int null_termination
, struct string_list_item
*it
,
958 if (null_termination
) {
959 fprintf(stdout
, "?? %s%c", it
->string
, 0);
961 struct strbuf onebuf
= STRBUF_INIT
;
963 one
= quote_path(it
->string
, -1, &onebuf
, s
->prefix
);
964 printf("?? %s\n", one
);
965 strbuf_release(&onebuf
);
969 int cmd_status(int argc
, const char **argv
, const char *prefix
)
972 static int null_termination
, shortstatus
;
974 unsigned char sha1
[20];
975 static struct option builtin_status_options
[] = {
976 OPT__VERBOSE(&verbose
),
977 OPT_BOOLEAN('s', "short", &shortstatus
,
978 "show status concicely"),
979 OPT_BOOLEAN('z', "null", &null_termination
,
980 "terminate entries with NUL"),
981 { OPTION_STRING
, 'u', "untracked-files", &untracked_files_arg
,
983 "show untracked files, optional modes: all, normal, no. (Default: all)",
984 PARSE_OPT_OPTARG
, NULL
, (intptr_t)"all" },
988 if (null_termination
)
991 wt_status_prepare(&s
);
992 git_config(git_status_config
, &s
);
993 argc
= parse_options(argc
, argv
, prefix
,
994 builtin_status_options
,
995 builtin_status_usage
, 0);
996 handle_untracked_files_arg(&s
);
999 s
.pathspec
= get_pathspec(prefix
, argv
);
1002 refresh_cache(REFRESH_QUIET
|REFRESH_UNMERGED
);
1003 s
.is_initial
= get_sha1(s
.reference
, sha1
) ? 1 : 0;
1004 wt_status_collect(&s
);
1007 for (i
= 0; i
< s
.change
.nr
; i
++) {
1008 struct wt_status_change_data
*d
;
1009 struct string_list_item
*it
;
1011 it
= &(s
.change
.items
[i
]);
1014 short_unmerged(null_termination
, it
, &s
);
1016 short_status(null_termination
, it
, &s
);
1018 for (i
= 0; i
< s
.untracked
.nr
; i
++) {
1019 struct string_list_item
*it
;
1021 it
= &(s
.untracked
.items
[i
]);
1022 short_untracked(null_termination
, it
, &s
);
1025 s
.verbose
= verbose
;
1026 if (s
.relative_paths
)
1028 if (s
.use_color
== -1)
1029 s
.use_color
= git_use_color_default
;
1030 if (diff_use_color_default
== -1)
1031 diff_use_color_default
= git_use_color_default
;
1032 wt_status_print(&s
);
1037 static void print_summary(const char *prefix
, const unsigned char *sha1
)
1039 struct rev_info rev
;
1040 struct commit
*commit
;
1041 static const char *format
= "format:%h] %s";
1042 unsigned char junk_sha1
[20];
1043 const char *head
= resolve_ref("HEAD", junk_sha1
, 0, NULL
);
1045 commit
= lookup_commit(sha1
);
1047 die("couldn't look up newly created commit");
1048 if (!commit
|| parse_commit(commit
))
1049 die("could not parse newly created commit");
1051 init_revisions(&rev
, prefix
);
1052 setup_revisions(0, NULL
, &rev
, NULL
);
1056 rev
.diffopt
.output_format
=
1057 DIFF_FORMAT_SHORTSTAT
| DIFF_FORMAT_SUMMARY
;
1059 rev
.verbose_header
= 1;
1060 rev
.show_root_diff
= 1;
1061 get_commit_format(format
, &rev
);
1062 rev
.always_show_header
= 0;
1063 rev
.diffopt
.detect_rename
= 1;
1064 rev
.diffopt
.rename_limit
= 100;
1065 rev
.diffopt
.break_opt
= 0;
1066 diff_setup_done(&rev
.diffopt
);
1069 !prefixcmp(head
, "refs/heads/") ?
1071 !strcmp(head
, "HEAD") ?
1074 initial_commit
? " (root-commit)" : "");
1076 if (!log_tree_commit(&rev
, commit
)) {
1077 struct strbuf buf
= STRBUF_INIT
;
1078 format_commit_message(commit
, format
+ 7, &buf
, DATE_NORMAL
);
1079 printf("%s\n", buf
.buf
);
1080 strbuf_release(&buf
);
1084 static int git_commit_config(const char *k
, const char *v
, void *cb
)
1086 struct wt_status
*s
= cb
;
1088 if (!strcmp(k
, "commit.template"))
1089 return git_config_string(&template_file
, k
, v
);
1091 return git_status_config(k
, v
, s
);
1094 int cmd_commit(int argc
, const char **argv
, const char *prefix
)
1096 struct strbuf sb
= STRBUF_INIT
;
1097 const char *index_file
, *reflog_msg
;
1099 unsigned char commit_sha1
[20];
1100 struct ref_lock
*ref_lock
;
1101 struct commit_list
*parents
= NULL
, **pptr
= &parents
;
1102 struct stat statbuf
;
1103 int allow_fast_forward
= 1;
1106 wt_status_prepare(&s
);
1107 git_config(git_commit_config
, &s
);
1109 if (s
.use_color
== -1)
1110 s
.use_color
= git_use_color_default
;
1112 argc
= parse_and_validate_options(argc
, argv
, builtin_commit_usage
,
1115 if (diff_use_color_default
== -1)
1116 diff_use_color_default
= git_use_color_default
;
1117 return dry_run_commit(argc
, argv
, prefix
, &s
);
1119 index_file
= prepare_index(argc
, argv
, prefix
, 0);
1121 /* Set up everything for writing the commit object. This includes
1122 running hooks, writing the trees, and interacting with the user. */
1123 if (!prepare_to_commit(index_file
, prefix
, &s
)) {
1124 rollback_index_files();
1128 /* Determine parents */
1129 if (initial_commit
) {
1130 reflog_msg
= "commit (initial)";
1132 struct commit_list
*c
;
1133 struct commit
*commit
;
1135 reflog_msg
= "commit (amend)";
1136 commit
= lookup_commit(head_sha1
);
1137 if (!commit
|| parse_commit(commit
))
1138 die("could not parse HEAD commit");
1140 for (c
= commit
->parents
; c
; c
= c
->next
)
1141 pptr
= &commit_list_insert(c
->item
, pptr
)->next
;
1142 } else if (in_merge
) {
1143 struct strbuf m
= STRBUF_INIT
;
1146 reflog_msg
= "commit (merge)";
1147 pptr
= &commit_list_insert(lookup_commit(head_sha1
), pptr
)->next
;
1148 fp
= fopen(git_path("MERGE_HEAD"), "r");
1150 die_errno("could not open '%s' for reading",
1151 git_path("MERGE_HEAD"));
1152 while (strbuf_getline(&m
, fp
, '\n') != EOF
) {
1153 unsigned char sha1
[20];
1154 if (get_sha1_hex(m
.buf
, sha1
) < 0)
1155 die("Corrupt MERGE_HEAD file (%s)", m
.buf
);
1156 pptr
= &commit_list_insert(lookup_commit(sha1
), pptr
)->next
;
1160 if (!stat(git_path("MERGE_MODE"), &statbuf
)) {
1161 if (strbuf_read_file(&sb
, git_path("MERGE_MODE"), 0) < 0)
1162 die_errno("could not read MERGE_MODE");
1163 if (!strcmp(sb
.buf
, "no-ff"))
1164 allow_fast_forward
= 0;
1166 if (allow_fast_forward
)
1167 parents
= reduce_heads(parents
);
1169 reflog_msg
= "commit";
1170 pptr
= &commit_list_insert(lookup_commit(head_sha1
), pptr
)->next
;
1173 /* Finally, get the commit message */
1175 if (strbuf_read_file(&sb
, git_path(commit_editmsg
), 0) < 0) {
1176 int saved_errno
= errno
;
1177 rollback_index_files();
1178 die("could not read commit message: %s", strerror(saved_errno
));
1181 /* Truncate the message just before the diff, if any. */
1183 p
= strstr(sb
.buf
, "\ndiff --git ");
1185 strbuf_setlen(&sb
, p
- sb
.buf
+ 1);
1188 if (cleanup_mode
!= CLEANUP_NONE
)
1189 stripspace(&sb
, cleanup_mode
== CLEANUP_ALL
);
1190 if (message_is_empty(&sb
)) {
1191 rollback_index_files();
1192 fprintf(stderr
, "Aborting commit due to empty commit message.\n");
1196 if (commit_tree(sb
.buf
, active_cache_tree
->sha1
, parents
, commit_sha1
,
1197 fmt_ident(author_name
, author_email
, author_date
,
1198 IDENT_ERROR_ON_NO_NAME
))) {
1199 rollback_index_files();
1200 die("failed to write commit object");
1203 ref_lock
= lock_any_ref_for_update("HEAD",
1204 initial_commit
? NULL
: head_sha1
,
1207 nl
= strchr(sb
.buf
, '\n');
1209 strbuf_setlen(&sb
, nl
+ 1 - sb
.buf
);
1211 strbuf_addch(&sb
, '\n');
1212 strbuf_insert(&sb
, 0, reflog_msg
, strlen(reflog_msg
));
1213 strbuf_insert(&sb
, strlen(reflog_msg
), ": ", 2);
1216 rollback_index_files();
1217 die("cannot lock HEAD ref");
1219 if (write_ref_sha1(ref_lock
, commit_sha1
, sb
.buf
) < 0) {
1220 rollback_index_files();
1221 die("cannot update HEAD ref");
1224 unlink(git_path("MERGE_HEAD"));
1225 unlink(git_path("MERGE_MSG"));
1226 unlink(git_path("MERGE_MODE"));
1227 unlink(git_path("SQUASH_MSG"));
1229 if (commit_index_files())
1230 die ("Repository has been updated, but unable to write\n"
1231 "new_index file. Check that disk is not full or quota is\n"
1232 "not exceeded, and then \"git reset HEAD\" to recover.");
1235 run_hook(get_index_file(), "post-commit", NULL
);
1237 print_summary(prefix
, commit_sha1
);