diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:01:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:01:16 -0700 |
| commit | 9affecbc89538b6fd63f772b6f14047bced9345e (patch) | |
| tree | b4047fd9dec7f6dde2c1d41eae23d8ce74375dc4 /builtin-commit.c | |
| parent | Merge branch 'jc/maint-add-p-coalesce-fix' (diff) | |
| parent | apply, fmt-merge-msg: use relative filenames (diff) | |
| download | git-9affecbc89538b6fd63f772b6f14047bced9345e.tar.gz git-9affecbc89538b6fd63f772b6f14047bced9345e.zip | |
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
* sb/maint-1.6.2-opt-filename-fix:
apply, fmt-merge-msg: use relative filenames
commit: -F overrides -t
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 81371b1d26..baaa75cf90 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -699,7 +699,11 @@ static int parse_and_validate_options(int argc, const char *argv[], argc = parse_options(argc, argv, builtin_commit_options, usage, 0); logfile = parse_options_fix_filename(prefix, logfile); + if (logfile) + logfile = xstrdup(logfile); template_file = parse_options_fix_filename(prefix, template_file); + if (template_file) + template_file = xstrdup(template_file); if (force_author && !strchr(force_author, '>')) force_author = find_author_by_nickname(force_author); |