Skip to content

Commit

Permalink
tests: test applying criss-cross rename patch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michał Kiedrowicz authored and Junio C Hamano committed Apr 20, 2009
1 parent 1f9b620 commit 1d49f0d
Showing 1 changed file with 38 additions and 0 deletions.
38 changes: 38 additions & 0 deletions t/t4130-apply-criss-cross-rename.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1d49f0d

Please sign in to comment.