diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-05-23 11:53:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 15:45:52 -0700 |
| commit | 4c8d4c14c6de59bc14d6118724ffee949e8654a7 (patch) | |
| tree | 6c7992062186e2f0a8b7b0b1314e3bd54d6bb4aa /builtin-fmt-merge-msg.c | |
| parent | aae94ffbc138181777a942ef18daf52606df833d (diff) | |
| download | git-4c8d4c14c6de59bc14d6118724ffee949e8654a7.tar.gz git-4c8d4c14c6de59bc14d6118724ffee949e8654a7.tar.xz | |
apply, fmt-merge-msg: use relative filenames
Commit dbd0f5c7 (Files given on the command line are relative to $cwd,
2008-08-06) only fixed git-commit and git-tag. But, git-apply and
git-fmt-merge-msg didn't get the update and exhibit the same behavior.
Fix them and add tests for "apply --build-fake-ancestor" and
"fmt-merge-msg -F".
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index df18f4070..c566c2df7 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -365,6 +365,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0); if (argc > 0) usage_with_options(fmt_merge_msg_usage, options); + inpath = parse_options_fix_filename(prefix, inpath); if (inpath && strcmp(inpath, "-")) { in = fopen(inpath, "r"); |