diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-22 12:28:25 -0800 |
| commit | f11f76b2bbcd23fe403744c055456a0bdf0981e7 (patch) | |
| tree | bbcf114146443e2f5d5d79ec8ed5ce160e5aab8a /builtin/merge-file.c | |
| parent | 073bb8ebb8f6213080162ac5632ba853d2e8cceb (diff) | |
| parent | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 (diff) | |
| download | git-f11f76b2bbcd23fe403744c055456a0bdf0981e7.tar.gz | |
Merge branch 'ab/merge-file-prefix'
"git merge-file" did not work correctly in a subdirectory.
* ab/merge-file-prefix:
merge-file: correctly open files when in a subdir
Diffstat (limited to 'builtin/merge-file.c')
| -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 131edc245f..ea8093f676 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); |