Commit 7168624c authored by Alex Riesen's avatar Alex Riesen Committed by Junio C Hamano

Do not generate full commit log message if it is not going to be used

Like when it is already specified through -C, -F or -m to git-commit.
Signed-off-by: default avatarAlex Riesen <>
Signed-off-by: default avatarJunio C Hamano <>
parent e475fe16
......@@ -367,6 +367,28 @@ static int prepare_log_message(const char *index_file, const char *prefix)
if (no_edit) {
struct rev_info rev;
unsigned char sha1[40];
if (!active_nr && read_cache() < 0)
die("Cannot read index");
if (get_sha1("HEAD", sha1) != 0)
return !!active_nr;
init_revisions(&rev, "");
rev.abbrev = 0;
setup_revisions(0, NULL, &rev, "HEAD");
DIFF_OPT_SET(&rev.diffopt, QUIET);
run_diff_index(&rev, 1 /* cached */);
return !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
if (in_merge && !no_edit)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment