зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
33367575b8
|
@ -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);
|
||||
|
|
|
@ -69,7 +69,8 @@ test_expect_success 'works in subdirectory' '
|
|||
cp new1.txt dir/a.txt &&
|
||||
cp orig.txt dir/o.txt &&
|
||||
cp new2.txt dir/b.txt &&
|
||||
( cd dir && git merge-file a.txt o.txt b.txt )
|
||||
( cd dir && git merge-file a.txt o.txt b.txt ) &&
|
||||
test_path_is_missing a.txt
|
||||
'
|
||||
|
||||
cp new1.txt test.txt
|
||||
|
|
Загрузка…
Ссылка в новой задаче