| commit | 010c7dbcbe2e55c1dcc85f23fbe55be6d7e931f0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Mar 2012 18:30:59 +0000 (30 11:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Mar 2012 18:30:59 +0000 (30 11:30 -0700) | ||
| tree | 75db8300a1c5b7e5463f5232c9a8cc4fb37fec4e | treesnapshot (tar.gz zip) |
| parent | c65dc351f0ae184f69cbc0b6555ff19aacb70e01 | commitdiff |
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 <gitster@pobox.com>
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 <gitster@pobox.com>
| builtin/commit.c | diffblobblamehistory | |
| t/t7501-commit.sh | diffblobblamehistory |