Browse Source

tests: test applying criss-cross rename patch

Originally reported by Linus in $gmane/116198

Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michał Kiedrowicz 16 years ago committed by Junio C Hamano
parent
commit
d8c81dfcaf
  1. 38
      t/t4130-apply-criss-cross-rename.sh

38
t/t4130-apply-criss-cross-rename.sh

@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
#!/bin/sh

test_description='git apply handling criss-cross rename patch.'
. ./test-lib.sh

create_file() {
cnt=0
while test $cnt -le 100
do
cnt=$(($cnt + 1))
echo "$2" >> "$1"
done
}

test_expect_success 'setup' '
create_file file1 "File1 contents" &&
create_file file2 "File2 contents" &&
git add file1 file2 &&
git commit -m 1
'

test_expect_success 'criss-cross rename' '
mv file1 tmp &&
mv file2 file1 &&
mv tmp file2
'

test_expect_success 'diff -M -B' '
git diff -M -B > diff &&
git reset --hard

'

test_expect_failure 'apply' '
git apply diff
'

test_done
Loading…
Cancel
Save