mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/maint-merge-file-subdir'

Browse Source 
* tr/maint-merge-file-subdir:
  merge-file: correctly find files when called in subdir
  prefix_filename(): safely handle the case where pfx_len=0
This commit is contained in:
Junio C Hamano
2010-11-17 15:00:56 -08:00
parent e2110c8d88 55846b9abd
commit ba0254cb32
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t6023-merge-file.sh
View File

@ -64,6 +64,14 @@ cp new1.txt test.txt
test_expect_success "merge without conflict" \
"git merge-file test.txt orig.txt new2.txt"
test_expect_success 'works in subdirectory' '
mkdir dir &&
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 )
'
cp new1.txt test.txt
test_expect_success "merge without conflict (--quiet)" \
"git merge-file --quiet test.txt orig.txt new2.txt"