diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 21:13:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 21:13:11 (GMT) |
| commit | 33367575b85a115900deac600cc4f8f03ec4754b (patch) | |
| tree | 1bf8567d605c6265bd5d1f43d9bafcf80aac54d4 /builtin | |
| parent | 3630be2749819b79de917a77c6627e3f84c00a11 (diff) | |
| parent | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 (diff) | |
| download | git-33367575b85a115900deac600cc4f8f03ec4754b.zip git-33367575b85a115900deac600cc4f8f03ec4754b.tar.gz git-33367575b85a115900deac600cc4f8f03ec4754b.tar.bz2 | |
Merge branch 'ab/merge-file-prefix' into maint
"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')
| -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 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); |