From 4c8d4c14c6de59bc14d6118724ffee949e8654a7 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Sat, 23 May 2009 11:53:11 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- builtin-apply.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'builtin-apply.c') diff --git a/builtin-apply.c b/builtin-apply.c index c6feaf5ca8..472865b7f1 100644 --- 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)) -- cgit v1.2.1