apply, fmt-merge-msg: use relative filenames

diff --git a/builtin-apply.c b/builtin-apply.c
index c6feaf5ca86f320ff3c512c2fb4e1e473936a0de..472865b7f199d0ad5e4f8402228e511bdf056dd7 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -3316,6 +3316,10 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
 
        argc = parse_options(argc, argv, builtin_apply_options,
                        apply_usage, 0);
+       fake_ancestor = parse_options_fix_filename(prefix, fake_ancestor);
+       if (fake_ancestor)
+               fake_ancestor = xstrdup(fake_ancestor);
+
        if (apply_with_reject)
                apply = apply_verbosely = 1;
        if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))