summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-05-23 18:53:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-23 22:45:52 (GMT)
commit4c8d4c14c6de59bc14d6118724ffee949e8654a7 (patch)
tree6c7992062186e2f0a8b7b0b1314e3bd54d6bb4aa /builtin-apply.c
parentaae94ffbc138181777a942ef18daf52606df833d (diff)
downloadgit-4c8d4c14c6de59bc14d6118724ffee949e8654a7.zip
git-4c8d4c14c6de59bc14d6118724ffee949e8654a7.tar.gz
git-4c8d4c14c6de59bc14d6118724ffee949e8654a7.tar.bz2
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-apply.c')
-rw-r--r--builtin-apply.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index c6feaf5..472865b 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))