diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:40 -0800 |
| commit | a49e9af4939c1223020db7915ee612d836c1bcdc (patch) | |
| tree | 51285aad2c6a4942b85542df0a07d658d69ef6df /builtin | |
| parent | 9f6774ed86a9ac22142c0b37e26e67eb1d032962 (diff) | |
| parent | 55846b9abd128185388418e025651cfd6a299a0e (diff) | |
| download | git-a49e9af4939c1223020db7915ee612d836c1bcdc.tar.gz git-a49e9af4939c1223020db7915ee612d836c1bcdc.tar.xz | |
Merge branch 'tr/maint-merge-file-subdir' into maint
* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge-file.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index b6664d49b..6c4afb5a3 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -28,6 +28,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) xmparam_t xmp = {{0}}; int ret = 0, i = 0, to_stdout = 0; int quiet = 0; + int prefixlen = 0; struct option options[] = { OPT_BOOLEAN('p', "stdout", &to_stdout, "send results to standard output"), OPT_SET_INT(0, "diff3", &xmp.style, "use a diff3 based merge", XDL_MERGE_DIFF3), @@ -65,10 +66,14 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) "%s\n", strerror(errno)); } + if (prefix) + prefixlen = strlen(prefix); + for (i = 0; i < 3; i++) { + const char *fname = prefix_filename(prefix, prefixlen, argv[i]); if (!names[i]) names[i] = argv[i]; - if (read_mmfile(mmfs + i, argv[i])) + if (read_mmfile(mmfs + i, fname)) return -1; if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size)) return error("Cannot merge binary files: %s\n", |