diff options
| author |  Aleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com> | 2015-02-08 17:53:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-02-11 11:01:50 -0800 |
| commit | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 (patch) | |
| tree | ae27dede5a5b4501c9afd7742154554a105b2d47 /builtin | |
| parent | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 (diff) | |
| download | tgif-204a8ffe67d2b789a34a14a06618a24756f7d9a9.tar.xz | |
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')
| -rw-r--r-- | builtin/merge-file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 844f84f40b..232b76857c 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); |