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

Merge branch 'jt/fast-export-copy-modify-fix'

Browse Source 
"git fast-export" with -M/-C option issued "copy" instruction on a
path that is simultaneously modified, which was incorrect.

* jt/fast-export-copy-modify-fix:
  fast-export: do not copy from modified file
This commit is contained in:
Junio C Hamano
2017-09-29 11:23:42 +09:00
parent 8c1bc7c244 b3e8ca89cf
commit 8096e1d385
2 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
t/t9350-fast-export.sh
View File

@ -234,7 +234,7 @@ test_expect_success 'fast-export -C -C | fast-import' '
mkdir new &&
git --git-dir=new/.git init &&
git fast-export -C -C --signed-tags=strip --all > output &&
grep "^C file6 file7\$" output &&
grep "^C file2 file4\$" output &&
cat output |
(cd new &&
git fast-import &&
@ -522,4 +522,22 @@ test_expect_success 'delete refspec' '
test_cmp expected actual
'
test_expect_success 'when using -C, do not declare copy when source of copy is also modified' '
test_create_repo src &&
echo a_line >src/file.txt &&
git -C src add file.txt &&
git -C src commit -m 1st_commit &&
cp src/file.txt src/file2.txt &&
echo another_line >>src/file.txt &&
git -C src add file.txt file2.txt &&
git -C src commit -m 2nd_commit &&
test_create_repo dst &&
git -C src fast-export --all -C | git -C dst fast-import &&
git -C src show >expected &&
git -C dst show >actual &&
test_cmp expected actual
'
test_done