summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorAleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com>2015-02-08 16:53:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-11 19:01:50 (GMT)
commit204a8ffe67d2b789a34a14a06618a24756f7d9a9 (patch)
treeae27dede5a5b4501c9afd7742154554a105b2d47 /builtin/merge-file.c
parent3d8a54eb37d298c251c0b6823dc06935a611bc33 (diff)
downloadgit-204a8ffe67d2b789a34a14a06618a24756f7d9a9.zip
git-204a8ffe67d2b789a34a14a06618a24756f7d9a9.tar.gz
git-204a8ffe67d2b789a34a14a06618a24756f7d9a9.tar.bz2
merge-file: correctly open files when in a subdir
run_setup_gently() is called before merge-file. This may result in changing current working directory, which wasn't taken into account when opening a file for writing. Fix by prepending the passed prefix. Previous var is left so that error messages keep referring to the file from the user's working directory perspective. Signed-off-by: Aleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
-rw-r--r--builtin/merge-file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 844f84f..232b768 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -90,7 +90,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (ret >= 0) {
const char *filename = argv[0];
- FILE *f = to_stdout ? stdout : fopen(filename, "wb");
+ const char *fpath = prefix_filename(prefix, prefixlen, argv[0]);
+ FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
if (!f)
ret = error("Could not open %s for writing", filename);