From 010c7dbcbe2e55c1dcc85f23fbe55be6d7e931f0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 30 Mar 2012 11:30:59 -0700 Subject: commit: do not trigger bogus "has templated message edited" check When "-t template" and "-F msg" options are both given (or worse yet, there is "commit.template" configuration but a message is given in some other way), the documentation says that template is ignored. However, the "has the user edited the message?" check still used the contents of the template file as the basis of the emptyness check. Signed-off-by: Junio C Hamano --- builtin/commit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index eba1377eb3..7141766ba9 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1049,6 +1049,8 @@ static int parse_and_validate_options(int argc, const char *argv[], die(_("Only one of -c/-C/-F/--fixup can be used.")); if (message.len && f > 0) die((_("Option -m cannot be combined with -c/-C/-F/--fixup."))); + if (f || message.len) + template_file = NULL; if (edit_message) use_message = edit_message; if (amend && !use_message && !fixup_message) -- cgit v1.2.1