diff options
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 764f4fdaac..e93a647c59 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -531,7 +531,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--) ; /* do nothing */ if (prefixcmp(sb.buf + i, sob.buf)) { - if (!ends_rfc2822_footer(&sb)) + if (!i || !ends_rfc2822_footer(&sb)) strbuf_addch(&sb, '\n'); strbuf_addbuf(&sb, &sob); } @@ -1005,7 +1005,7 @@ static int git_commit_config(const char *k, const char *v, void *cb) struct wt_status *s = cb; if (!strcmp(k, "commit.template")) - return git_config_string(&template_file, k, v); + return git_config_pathname(&template_file, k, v); return git_status_config(k, v, s); } |