development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 11:07:55 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'ab/merge-file-prefix' into maint

Browse source 
"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:
Junio C Hamano 2015-03-05 13:13:10 -08:00
parent 3630be2749 204a8ffe67
commit 33367575b8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builtin/merge-file.c
View file

@ -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);

3
t/t6023-merge-file.sh
View file

@ -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