/*

* Builtin "git commit"

*

* Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>

* Based on git-commit.sh by Junio C Hamano and Linus Torvalds

*/

#include "cache.h"

#include "cache-tree.h"

#include "color.h"

#include "dir.h"

#include "builtin.h"

#include "diff.h"

#include "diffcore.h"

#include "commit.h"

#include "revision.h"

#include "wt-status.h"

#include "run-command.h"

#include "refs.h"

#include "log-tree.h"

#include "strbuf.h"

#include "utf8.h"

#include "parse-options.h"

#include "string-list.h"

#include "rerere.h"

#include "unpack-trees.h"

#include "quote.h"

#include "submodule.h"

#include "gpg-interface.h"

static const char * const builtin_commit_usage[] = {

"git commit [options] [--] <filepattern>...",

NULL

};

static const char * const builtin_status_usage[] = {

"git status [options] [--] <filepattern>...",

NULL

};

static const char implicit_ident_advice[] =

N_("Your name and email address were configured automatically based\n"

"on your username and hostname. Please check that they are accurate.\n"

"You can suppress this message by setting them explicitly:\n"

"\n"

" git config --global user.name \"Your Name\"\n"

" git config --global user.email you@example.com\n"

"\n"

"After doing this, you may fix the identity used for this commit with:\n"

"\n"

" git commit --amend --reset-author\n");

static const char empty_amend_advice[] =

N_("You asked to amend the most recent commit, but doing so would make\n"

"it empty. You can repeat your command with --allow-empty, or you can\n"

"remove the commit entirely with \"git reset HEAD^\".\n");

static const char empty_cherry_pick_advice[] =

N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

"If you wish to commit it anyway, use:\n"

"\n"

" git commit --allow-empty\n"

"\n"

"Otherwise, please use 'git reset'\n");

static const char *use_message_buffer;

static const char commit_editmsg[] = "COMMIT_EDITMSG";

static struct lock_file index_lock; /* real index */

static struct lock_file false_lock; /* used only for partial commits */

static enum {

COMMIT_AS_IS = 1,

COMMIT_NORMAL,

COMMIT_PARTIAL

} commit_style;

static const char *logfile, *force_author;

static const char *template_file;

/*

* The _message variables are commit names from which to take

* the commit message and/or authorship.

*/

static const char *author_message, *author_message_buffer;

static char *edit_message, *use_message;

static char *fixup_message, *squash_message;

static int all, also, interactive, patch_interactive, only, amend, signoff;

static int edit_flag = -1; /* unspecified */

static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;

static int no_post_rewrite, allow_empty_message;

static char *untracked_files_arg, *force_date, *ignore_submodule_arg;

static char *sign_commit;

/*

* The default commit message cleanup mode will remove the lines

* beginning with # (shell comments) and leading and trailing

* whitespaces (empty lines or containing only whitespaces)

* if editor is used, and only the whitespaces if the message

* is specified explicitly.

*/

static enum {

CLEANUP_SPACE,

CLEANUP_NONE,

CLEANUP_ALL

} cleanup_mode;

static char *cleanup_arg;

static enum commit_whence whence;

static int use_editor = 1, include_status = 1;

static int show_ignored_in_status;

static const char *only_include_assumed;

static struct strbuf message = STRBUF_INIT;

static int null_termination;

static enum {

STATUS_FORMAT_LONG,

STATUS_FORMAT_SHORT,

STATUS_FORMAT_PORCELAIN

} status_format = STATUS_FORMAT_LONG;

static int status_show_branch;

static int opt_parse_m(const struct option *opt, const char *arg, int unset)

{

struct strbuf *buf = opt->value;

if (unset)

strbuf_setlen(buf, 0);

else {

strbuf_addstr(buf, arg);

strbuf_addstr(buf, "\n\n");

}

return 0;

}

static struct option builtin_commit_options[] = {

OPT__QUIET(&quiet, "suppress summary after successful commit"),

OPT__VERBOSE(&verbose, "show diff in commit message template"),

OPT_GROUP("Commit message options"),

OPT_FILENAME('F', "file", &logfile, "read message from file"),

OPT_STRING(0, "author", &force_author, "author", "override author for commit"),

OPT_STRING(0, "date", &force_date, "date", "override date for commit"),

OPT_CALLBACK('m', "message", &message, "message", "commit message", opt_parse_m),

OPT_STRING('c', "reedit-message", &edit_message, "commit", "reuse and edit message from specified commit"),

OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"),

OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"),

OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"),

OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C/-c/--amend)"),

OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),

OPT_FILENAME('t', "template", &template_file, "use specified template file"),

OPT_BOOL('e', "edit", &edit_flag, "force edit of commit"),

OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),

OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),

{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, "key id",

"GPG sign commit", PARSE_OPT_OPTARG, NULL, (intptr_t) "" },

/* end commit message options */

OPT_GROUP("Commit contents options"),

OPT_BOOLEAN('a', "all", &all, "commit all changed files"),

OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),

OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),

OPT_BOOLEAN('p', "patch", &patch_interactive, "interactively add changes"),

OPT_BOOLEAN('o', "only", &only, "commit only specified files"),

OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),

OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),

OPT_SET_INT(0, "short", &status_format, "show status concisely",

STATUS_FORMAT_SHORT),

OPT_BOOLEAN(0, "branch", &status_show_branch, "show branch information"),

OPT_SET_INT(0, "porcelain", &status_format,

"machine-readable output", STATUS_FORMAT_PORCELAIN),

OPT_BOOLEAN('z', "null", &null_termination,

"terminate entries with NUL"),

OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),

OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),

{ 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" },

/* end commit contents options */

{ OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,

"ok to record an empty change",

PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },

{ OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,

"ok to record a change with an empty message",

PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },

OPT_END()

};

static void determine_whence(struct wt_status *s)

{

if (file_exists(git_path("MERGE_HEAD")))

whence = FROM_MERGE;

else if (file_exists(git_path("CHERRY_PICK_HEAD")))

whence = FROM_CHERRY_PICK;

else

whence = FROM_COMMIT;

if (s)

s->whence = whence;

}

static const char *whence_s(void)

{

char *s = "";

switch (whence) {

case FROM_COMMIT:

break;

case FROM_MERGE:

s = "merge";

break;

case FROM_CHERRY_PICK:

s = "cherry-pick";

break;

}

return s;

}

static void rollback_index_files(void)

{

switch (commit_style) {

case COMMIT_AS_IS:

break; /* nothing to do */

case COMMIT_NORMAL:

rollback_lock_file(&index_lock);

break;

case COMMIT_PARTIAL:

rollback_lock_file(&index_lock);

rollback_lock_file(&false_lock);

break;

}

}

static int commit_index_files(void)

{

int err = 0;

switch (commit_style) {

case COMMIT_AS_IS:

break; /* nothing to do */

case COMMIT_NORMAL:

err = commit_lock_file(&index_lock);

break;

case COMMIT_PARTIAL:

err = commit_lock_file(&index_lock);

rollback_lock_file(&false_lock);

break;

}

return err;

}

/*

* Take a union of paths in the index and the named tree (typically, "HEAD"),

* and return the paths that match the given pattern in list.

*/

static int list_paths(struct string_list *list, const char *with_tree,

const char *prefix, const char **pattern)

{

int i;

char *m;

for (i = 0; pattern[i]; i++)

;

m = xcalloc(1, i);

if (with_tree) {

char *max_prefix = common_prefix(pattern);

overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix);

free(max_prefix);

}

for (i = 0; i < active_nr; i++) {

struct cache_entry *ce = active_cache[i];

struct string_list_item *item;

if (ce->ce_flags & CE_UPDATE)

continue;

if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))

continue;

item = string_list_insert(list, ce->name);

if (ce_skip_worktree(ce))

item->util = item; /* better a valid pointer than a fake one */

}

return report_path_error(m, pattern, prefix);

}

static void add_remove_files(struct string_list *list)

{

int i;

for (i = 0; i < list->nr; i++) {

struct stat st;

struct string_list_item *p = &(list->items[i]);

/* p->util is skip-worktree */

if (p->util)

continue;

if (!lstat(p->string, &st)) {

if (add_to_cache(p->string, &st, 0))

die(_("updating files failed"));

} else

remove_file_from_cache(p->string);

}

}

static void create_base_index(const struct commit *current_head)

{

struct tree *tree;

struct unpack_trees_options opts;

struct tree_desc t;

if (!current_head) {

discard_cache();

return;

}

memset(&opts, 0, sizeof(opts));

opts.head_idx = 1;

opts.index_only = 1;

opts.merge = 1;

opts.src_index = &the_index;

opts.dst_index = &the_index;

opts.fn = oneway_merge;

tree = parse_tree_indirect(current_head->object.sha1);

if (!tree)

die(_("failed to unpack HEAD tree object"));

parse_tree(tree);

init_tree_desc(&t, tree->buffer, tree->size);

if (unpack_trees(1, &t, &opts))

exit(128); /* We've already reported the error, finish dying */

}

static void refresh_cache_or_die(int refresh_flags)

{

/*

* refresh_flags contains REFRESH_QUIET, so the only errors

* are for unmerged entries.

*/

if (refresh_cache(refresh_flags | REFRESH_IN_PORCELAIN))

die_resolve_conflict("commit");

}

static char *prepare_index(int argc, const char **argv, const char *prefix,

const struct commit *current_head, int is_status)

{

int fd;

struct string_list partial;

const char **pathspec = NULL;

char *old_index_env = NULL;

int refresh_flags = REFRESH_QUIET;

if (is_status)

refresh_flags |= REFRESH_UNMERGED;

if (*argv)

pathspec = get_pathspec(prefix, argv);

if (read_cache_preload(pathspec) < 0)

die(_("index file corrupt"));

if (interactive) {

fd = hold_locked_index(&index_lock, 1);

refresh_cache_or_die(refresh_flags);

if (write_cache(fd, active_cache, active_nr) ||

close_lock_file(&index_lock))

die(_("unable to create temporary index"));

old_index_env = getenv(INDEX_ENVIRONMENT);

setenv(INDEX_ENVIRONMENT, index_lock.filename, 1);

if (interactive_add(argc, argv, prefix, patch_interactive) != 0)

die(_("interactive add failed"));

if (old_index_env && *old_index_env)

setenv(INDEX_ENVIRONMENT, old_index_env, 1);

else

unsetenv(INDEX_ENVIRONMENT);

discard_cache();

read_cache_from(index_lock.filename);

commit_style = COMMIT_NORMAL;

return index_lock.filename;

}

/*

* Non partial, non as-is commit.

*

* (1) get the real index;

* (2) update the_index as necessary;

* (3) write the_index out to the real index (still locked);

* (4) return the name of the locked index file.

*

* The caller should run hooks on the locked real index, and

* (A) if all goes well, commit the real index;

* (B) on failure, rollback the real index.

*/

if (all || (also && pathspec && *pathspec)) {

fd = hold_locked_index(&index_lock, 1);

add_files_to_cache(also ? prefix : NULL, pathspec, 0);

refresh_cache_or_die(refresh_flags);

update_main_cache_tree(1);

if (write_cache(fd, active_cache, active_nr) ||

close_lock_file(&index_lock))

die(_("unable to write new_index file"));

commit_style = COMMIT_NORMAL;

return index_lock.filename;

}

/*

* As-is commit.

*

* (1) return the name of the real index file.

*

* The caller should run hooks on the real index,

* and create commit from the_index.

* We still need to refresh the index here.

*/

if (!pathspec || !*pathspec) {

fd = hold_locked_index(&index_lock, 1);

refresh_cache_or_die(refresh_flags);

if (active_cache_changed) {

update_main_cache_tree(1);

if (write_cache(fd, active_cache, active_nr) ||

commit_locked_index(&index_lock))

die(_("unable to write new_index file"));

} else {

rollback_lock_file(&index_lock);

}

commit_style = COMMIT_AS_IS;

return get_index_file();

}

/*

* A partial commit.

*

* (0) find the set of affected paths;

* (1) get lock on the real index file;

* (2) update the_index with the given paths;

* (3) write the_index out to the real index (still locked);

* (4) get lock on the false index file;

* (5) reset the_index from HEAD;

* (6) update the_index the same way as (2);

* (7) write the_index out to the false index file;

* (8) return the name of the false index file (still locked);

*

* The caller should run hooks on the locked false index, and

* create commit from it. Then

* (A) if all goes well, commit the real index;

* (B) on failure, rollback the real index;

* In either case, rollback the false index.

*/

commit_style = COMMIT_PARTIAL;

if (whence != FROM_COMMIT)

die(_("cannot do a partial commit during a %s."), whence_s());

memset(&partial, 0, sizeof(partial));

partial.strdup_strings = 1;

if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, pathspec))

exit(1);

discard_cache();

if (read_cache() < 0)

die(_("cannot read the index"));

fd = hold_locked_index(&index_lock, 1);

add_remove_files(&partial);

refresh_cache(REFRESH_QUIET);

if (write_cache(fd, active_cache, active_nr) ||

close_lock_file(&index_lock))

die(_("unable to write new_index file"));

fd = hold_lock_file_for_update(&false_lock,

git_path("next-index-%"PRIuMAX,

(uintmax_t) getpid()),

LOCK_DIE_ON_ERROR);

create_base_index(current_head);

add_remove_files(&partial);

refresh_cache(REFRESH_QUIET);

if (write_cache(fd, active_cache, active_nr) ||

close_lock_file(&false_lock))

die(_("unable to write temporary index file"));

discard_cache();

read_cache_from(false_lock.filename);

return false_lock.filename;

}

static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,

struct wt_status *s)

{

unsigned char sha1[20];

if (s->relative_paths)

s->prefix = prefix;

if (amend) {

s->amend = 1;

s->reference = "HEAD^1";

}

s->verbose = verbose;

s->index_file = index_file;

s->fp = fp;

s->nowarn = nowarn;

s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;

wt_status_collect(s);

switch (status_format) {

case STATUS_FORMAT_SHORT:

wt_shortstatus_print(s, null_termination, status_show_branch);

break;

case STATUS_FORMAT_PORCELAIN:

wt_porcelain_print(s, null_termination);

break;

case STATUS_FORMAT_LONG:

wt_status_print(s);

break;

}

return s->commitable;

}

static int is_a_merge(const struct commit *current_head)

{

return !!(current_head->parents && current_head->parents->next);

}

static const char sign_off_header[] = "Signed-off-by: ";

static void determine_author_info(struct strbuf *author_ident)

{

char *name, *email, *date;

name = getenv("GIT_AUTHOR_NAME");

email = getenv("GIT_AUTHOR_EMAIL");

date = getenv("GIT_AUTHOR_DATE");

if (author_message) {

const char *a, *lb, *rb, *eol;

a = strstr(author_message_buffer, "\nauthor ");

if (!a)

die(_("invalid commit: %s"), author_message);

lb = strchrnul(a + strlen("\nauthor "), '<');

rb = strchrnul(lb, '>');

eol = strchrnul(rb, '\n');

if (!*lb || !*rb || !*eol)

die(_("invalid commit: %s"), author_message);

if (lb == a + strlen("\nauthor "))

/* \nauthor <foo@example.com> */

name = xcalloc(1, 1);

else

name = xmemdupz(a + strlen("\nauthor "),

(lb - strlen(" ") -

(a + strlen("\nauthor "))));

email = xmemdupz(lb + strlen("<"), rb - (lb + strlen("<")));

date = xmemdupz(rb + strlen("> "), eol - (rb + strlen("> ")));

}

if (force_author) {

const char *lb = strstr(force_author, " <");

const char *rb = strchr(force_author, '>');

if (!lb || !rb)

die(_("malformed --author parameter"));

name = xstrndup(force_author, lb - force_author);

email = xstrndup(lb + 2, rb - (lb + 2));

}

if (force_date)

date = force_date;

strbuf_addstr(author_ident, fmt_ident(name, email, date,

IDENT_ERROR_ON_NO_NAME));

}

static int ends_rfc2822_footer(struct strbuf *sb)

{

int ch;

int hit = 0;

int i, j, k;

int len = sb->len;

int first = 1;

const char *buf = sb->buf;

for (i = len - 1; i > 0; i--) {

if (hit && buf[i] == '\n')

break;

hit = (buf[i] == '\n');

}

while (i < len - 1 && buf[i] == '\n')

i++;

for (; i < len; i = k) {

for (k = i; k < len && buf[k] != '\n'; k++)

; /* do nothing */

k++;

if ((buf[k] == ' ' || buf[k] == '\t') && !first)

continue;

first = 0;

for (j = 0; i + j < len; j++) {

ch = buf[i + j];

if (ch == ':')

break;

if (isalnum(ch) ||

(ch == '-'))

continue;

return 0;

}

}

return 1;

}

static char *cut_ident_timestamp_part(char *string)

{

char *ket = strrchr(string, '>');

if (!ket || ket[1] != ' ')

die(_("Malformed ident string: '%s'"), string);

*++ket = '\0';

return ket;

}

static int prepare_to_commit(const char *index_file, const char *prefix,

struct commit *current_head,

struct wt_status *s,

struct strbuf *author_ident)

{

struct stat statbuf;

struct strbuf committer_ident = STRBUF_INIT;

int commitable, saved_color_setting;

struct strbuf sb = STRBUF_INIT;

char *buffer;

const char *hook_arg1 = NULL;

const char *hook_arg2 = NULL;

int ident_shown = 0;

int clean_message_contents = (cleanup_mode != CLEANUP_NONE);

if (!no_verify && run_hook(index_file, "pre-commit", NULL))

return 0;

if (squash_message) {

/*

* Insert the proper subject line before other commit

* message options add their content.

*/

if (use_message && !strcmp(use_message, squash_message))

strbuf_addstr(&sb, "squash! ");

else {

struct pretty_print_context ctx = {0};

struct commit *c;

c = lookup_commit_reference_by_name(squash_message);

if (!c)

die(_("could not lookup commit %s"), squash_message);

ctx.output_encoding = get_commit_output_encoding();

format_commit_message(c, "squash! %s\n\n", &sb,

&ctx);

}

}

if (message.len) {

strbuf_addbuf(&sb, &message);

hook_arg1 = "message";

} else if (logfile && !strcmp(logfile, "-")) {

if (isatty(0))

fprintf(stderr, _("(reading log message from standard input)\n"));

if (strbuf_read(&sb, 0, 0) < 0)

die_errno(_("could not read log from standard input"));

hook_arg1 = "message";

} else if (logfile) {

if (strbuf_read_file(&sb, logfile, 0) < 0)

die_errno(_("could not read log file '%s'"),

logfile);

hook_arg1 = "message";

} else if (use_message) {

buffer = strstr(use_message_buffer, "\n\n");

if (!buffer || buffer[2] == '\0')

die(_("commit has empty message"));

strbuf_add(&sb, buffer + 2, strlen(buffer + 2));

hook_arg1 = "commit";

hook_arg2 = use_message;

} else if (fixup_message) {

struct pretty_print_context ctx = {0};

struct commit *commit;

commit = lookup_commit_reference_by_name(fixup_message);

if (!commit)

die(_("could not lookup commit %s"), fixup_message);

ctx.output_encoding = get_commit_output_encoding();

format_commit_message(commit, "fixup! %s\n\n",

&sb, &ctx);

hook_arg1 = "message";

} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {

if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)

die_errno(_("could not read MERGE_MSG"));

hook_arg1 = "merge";

} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {

if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)

die_errno(_("could not read SQUASH_MSG"));

hook_arg1 = "squash";

} else if (template_file) {

if (strbuf_read_file(&sb, template_file, 0) < 0)

die_errno(_("could not read '%s'"), template_file);

hook_arg1 = "template";

clean_message_contents = 0;

}

/*

* The remaining cases don't modify the template message, but

* just set the argument(s) to the prepare-commit-msg hook.

*/

else if (whence == FROM_MERGE)

hook_arg1 = "merge";

else if (whence == FROM_CHERRY_PICK) {

hook_arg1 = "commit";

hook_arg2 = "CHERRY_PICK_HEAD";

}

if (squash_message) {

/*

* If squash_commit was used for the commit subject,

* then we're possibly hijacking other commit log options.

* Reset the hook args to tell the real story.

*/

hook_arg1 = "message";

hook_arg2 = "";

}

s->fp = fopen(git_path(commit_editmsg), "w");

if (s->fp == NULL)

die_errno(_("could not open '%s'"), git_path(commit_editmsg));

if (clean_message_contents)

stripspace(&sb, 0);

if (signoff) {

struct strbuf sob = STRBUF_INIT;

int i;

strbuf_addstr(&sob, sign_off_header);

strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),

getenv("GIT_COMMITTER_EMAIL")));

strbuf_addch(&sob, '\n');

for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)

; /* do nothing */

if (prefixcmp(sb.buf + i, sob.buf)) {

if (!i || !ends_rfc2822_footer(&sb))

strbuf_addch(&sb, '\n');

strbuf_addbuf(&sb, &sob);

}

strbuf_release(&sob);

}

if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)

die_errno(_("could not write commit template"));

strbuf_release(&sb);

/* This checks and barfs if author is badly specified */

determine_author_info(author_ident);

/* This checks if committer ident is explicitly given */

strbuf_addstr(&committer_ident, git_committer_info(0));

if (use_editor && include_status) {

char *ai_tmp, *ci_tmp;

if (whence != FROM_COMMIT)

status_printf_ln(s, GIT_COLOR_NORMAL,

_("\n"

"It looks like you may be committing a %s.\n"

"If this is not correct, please remove the file\n"

" %s\n"

"and try again.\n"

""),

whence_s(),

git_path(whence == FROM_MERGE

? "MERGE_HEAD"

: "CHERRY_PICK_HEAD"));

fprintf(s->fp, "\n");

status_printf(s, GIT_COLOR_NORMAL,

_("Please enter the commit message for your changes."));

if (cleanup_mode == CLEANUP_ALL)

status_printf_more(s, GIT_COLOR_NORMAL,

_(" Lines starting\n"

"with '#' will be ignored, and an empty"

" message aborts the commit.\n"));

else /* CLEANUP_SPACE, that is. */

status_printf_more(s, GIT_COLOR_NORMAL,

_(" Lines starting\n"

"with '#' will be kept; you may remove them"

" yourself if you want to.\n"

"An empty message aborts the commit.\n"));

if (only_include_assumed)

status_printf_ln(s, GIT_COLOR_NORMAL,

"%s", only_include_assumed);

ai_tmp = cut_ident_timestamp_part(author_ident->buf);

ci_tmp = cut_ident_timestamp_part(committer_ident.buf);

if (strcmp(author_ident->buf, committer_ident.buf))

status_printf_ln(s, GIT_COLOR_NORMAL,

_("%s"

"Author: %s"),

ident_shown++ ? "" : "\n",

author_ident->buf);

if (!user_ident_sufficiently_given())

status_printf_ln(s, GIT_COLOR_NORMAL,

_("%s"

"Committer: %s"),

ident_shown++ ? "" : "\n",

committer_ident.buf);

if (ident_shown)

status_printf_ln(s, GIT_COLOR_NORMAL, "");

saved_color_setting = s->use_color;

s->use_color = 0;

commitable = run_status(s->fp, index_file, prefix, 1, s);

s->use_color = saved_color_setting;

*ai_tmp = ' ';

*ci_tmp = ' ';

} else {

unsigned char sha1[20];

const char *parent = "HEAD";

if (!active_nr && read_cache() < 0)

die(_("Cannot read index"));

if (amend)

parent = "HEAD^1";

if (get_sha1(parent, sha1))

commitable = !!active_nr;

else

commitable = index_differs_from(parent, 0);

}

strbuf_release(&committer_ident);

fclose(s->fp);

/*

* Reject an attempt to record a non-merge empty commit without

* explicit --allow-empty. In the cherry-pick case, it may be

* empty due to conflict resolution, which the user should okay.

*/

if (!commitable && whence != FROM_MERGE && !allow_empty &&

!(amend && is_a_merge(current_head))) {

run_status(stdout, index_file, prefix, 0, s);

if (amend)

fputs(_(empty_amend_advice), stderr);

else if (whence == FROM_CHERRY_PICK)

fputs(_(empty_cherry_pick_advice), stderr);

return 0;

}

/*

* Re-read the index as pre-commit hook could have updated it,

* and write it out as a tree. We must do this before we invoke

* the editor and after we invoke run_status above.

*/

discard_cache();

read_cache_from(index_file);

if (update_main_cache_tree(0)) {

error(_("Error building trees"));

return 0;

}

if (run_hook(index_file, "prepare-commit-msg",

git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))

return 0;

if (use_editor) {

char index[PATH_MAX];

const char *env[2] = { NULL };

env[0] = index;

snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);

if (launch_editor(git_path(commit_editmsg), NULL, env)) {

fprintf(stderr,

_("Please supply the message using either -m or -F option.\n"));

exit(1);

}

}

if (!no_verify &&

run_hook(index_file, "commit-msg", git_path(commit_editmsg), NULL)) {

return 0;

}

return 1;

}

/*

* Find out if the message in the strbuf contains only whitespace and

* Signed-off-by lines.

*/

static int message_is_empty(struct strbuf *sb)

{

struct strbuf tmpl = STRBUF_INIT;

const char *nl;

int eol, i, start = 0;

if (cleanup_mode == CLEANUP_NONE && sb->len)

return 0;

/* See if the template is just a prefix of the message. */

if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {

stripspace(&tmpl, cleanup_mode == CLEANUP_ALL);

if (start + tmpl.len <= sb->len &&

memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)

start += tmpl.len;

}

strbuf_release(&tmpl);

/* Check if the rest is just whitespace and Signed-of-by's. */

for (i = start; i < sb->len; i++) {

nl = memchr(sb->buf + i, '\n', sb->len - i);

if (nl)

eol = nl - sb->buf;

else

eol = sb->len;

if (strlen(sign_off_header) <= eol - i &&

!prefixcmp(sb->buf + i, sign_off_header)) {

i = eol;

continue;

}

while (i < eol)

if (!isspace(sb->buf[i++]))

return 0;

}

return 1;

}

static const char *find_author_by_nickname(const char *name)

{

struct rev_info revs;

struct commit *commit;

struct strbuf buf = STRBUF_INIT;

const char *av[20];

int ac = 0;

init_revisions(&revs, NULL);

strbuf_addf(&buf, "--author=%s", name);

av[++ac] = "--all";

av[++ac] = "-i";

av[++ac] = buf.buf;

av[++ac] = NULL;

setup_revisions(ac, av, &revs, NULL);

prepare_revision_walk(&revs);

commit = get_revision(&revs);

if (commit) {

struct pretty_print_context ctx = {0};

ctx.date_mode = DATE_NORMAL;

strbuf_release(&buf);

format_commit_message(commit, "%an <%ae>", &buf, &ctx);

return strbuf_detach(&buf, NULL);

}

die(_("No existing author found with '%s'"), name);

}

static void handle_untracked_files_arg(struct wt_status *s)

{

if (!untracked_files_arg)

; /* default already initialized */

else if (!strcmp(untracked_files_arg, "no"))

s->show_untracked_files = SHOW_NO_UNTRACKED_FILES;

else if (!strcmp(untracked_files_arg, "normal"))

s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;

else if (!strcmp(untracked_files_arg, "all"))

s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;

else

die(_("Invalid untracked files mode '%s'"), untracked_files_arg);

}

static const char *read_commit_message(const char *name)

{

const char *out_enc, *out;

struct commit *commit;

commit = lookup_commit_reference_by_name(name);

if (!commit)

die(_("could not lookup commit %s"), name);

out_enc = get_commit_output_encoding();

out = logmsg_reencode(commit, out_enc);

/*

* If we failed to reencode the buffer, just copy it

* byte for byte so the user can try to fix it up.