diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-06 01:33:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-06 01:33:16 (GMT) |
| commit | 08b51f51e6a4cf2f5ad4b893707f1337a450e499 (patch) | |
| tree | 1ff3a0c83f79c221194ac91ee6c2018d477ec7af /builtin-commit.c | |
| parent | 1fc561d169ac08c411e34a4439894c5201b3d080 (diff) | |
| parent | 9b373229506c9f563b2e2f053c3f1d932789fbfd (diff) | |
| download | git-08b51f51e6a4cf2f5ad4b893707f1337a450e499.zip git-08b51f51e6a4cf2f5ad4b893707f1337a450e499.tar.gz git-08b51f51e6a4cf2f5ad4b893707f1337a450e499.tar.bz2 | |
Merge branch 'qq/maint'
* qq/maint:
clone -q: honor "quiet" option over native transports.
attribute documentation: keep EXAMPLE at end
builtin-commit.c: Use 'git_config_string' to get 'commit.template'
http.c: Use 'git_config_string' to clean up SSL config.
diff.c: Use 'git_config_string' to get 'diff.external'
convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
Documentation cvs: Clarify when a bare repository is needed
Documentation: be precise about which date --pretty uses
Conflicts:
Documentation/gitattributes.txt
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index e3ad38b..745c11e 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -45,7 +45,8 @@ static enum { COMMIT_PARTIAL, } commit_style; -static char *logfile, *force_author, *template_file; +static char *logfile, *force_author; +static const char *template_file; static char *edit_message, *use_message; static char *author_name, *author_email, *author_date; static int all, edit_flag, also, interactive, only, amend, signoff; @@ -877,12 +878,8 @@ static void print_summary(const char *prefix, const unsigned char *sha1) int git_commit_config(const char *k, const char *v, void *cb) { - if (!strcmp(k, "commit.template")) { - if (!v) - return config_error_nonbool(v); - template_file = xstrdup(v); - return 0; - } + if (!strcmp(k, "commit.template")) + return git_config_string(&template_file, k, v); return git_status_config(k, v, cb); } |