development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mk/maint-apply-swap'

Browse source 
* mk/maint-apply-swap:
  tests: make test-apply-criss-cross-rename more robust
  builtin-apply: keep information about files to be deleted
  tests: test applying criss-cross rename patch

Conflicts:
	t/t4130-apply-criss-cross-rename.sh
This commit is contained in:
Junio C Hamano 2009-04-21 00:16:09 -07:00
parent 062868cc00 f0583867e7
commit 0be9bc0f0a
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
t/t4130-apply-criss-cross-rename.sh
View file

@ -15,14 +15,17 @@ create_file() {
test_expect_success 'setup' '
create_file file1 "File1 contents" &&
create_file file2 "File2 contents" &&
git add file1 file2 &&
create_file file3 "File3 contents" &&
git add file1 file2 file3 &&
git commit -m 1
'
test_expect_success 'criss-cross rename' '
mv file1 tmp &&
mv file2 file1 &&
mv tmp file2
mv tmp file2 &&
cp file1 file1-swapped &&
cp file2 file2-swapped
'
test_expect_success 'diff -M -B' '
@ -32,7 +35,32 @@ test_expect_success 'diff -M -B' '
'
test_expect_success 'apply' '
git apply diff
git apply diff &&
test_cmp file1 file1-swapped &&
test_cmp file2 file2-swapped
'
test_expect_success 'criss-cross rename' '
git reset --hard &&
mv file1 tmp &&
mv file2 file1 &&
mv file3 file2
mv tmp file3 &&
cp file1 file1-swapped &&
cp file2 file2-swapped &&
cp file3 file3-swapped
'
test_expect_success 'diff -M -B' '
git diff -M -B > diff &&
git reset --hard
'
test_expect_success 'apply' '
git apply diff &&
test_cmp file1 file1-swapped &&
test_cmp file2 file2-swapped &&
test_cmp file3 file3-swapped
'
test_done