1c720357ce
In459b8d22e5(tests: do not borrow from COPYING and README from the real source, 2015-02-15) tests that used "lib-diff.sh" (called "diff-lib.sh" then) were made to stop relying on the top-level COPYING file, but we still had other tests that referenced it. Let's move them over to use the "COPYING_test_data" utility function introduced in the preceding commit, and in the case of the one test that needed the "README" file use a ROT 13 version of that "COPYING" test data. That test added inafd222967c(Extend testing git-mv for renaming of subdirectories, 2006-07-26) just needs more test data that's not the same as the "COPYING" test data, so a ROT 13 version will do. This change removes the last references to ../{README,COPYING} in the test suite. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
102 lines
2.1 KiB
Bash
Executable File
102 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='rewrite diff'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-diff-data.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
COPYING_test_data >test.data &&
|
|
cp test.data test &&
|
|
git add test &&
|
|
tr \
|
|
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
|
|
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
|
|
<test.data >test &&
|
|
echo "to be deleted" >test2 &&
|
|
blob=$(git hash-object test2) &&
|
|
blob=$(git rev-parse --short $blob) &&
|
|
git add test2
|
|
|
|
'
|
|
|
|
test_expect_success 'detect rewrite' '
|
|
|
|
actual=$(git diff-files -B --summary test) &&
|
|
verbose expr "$actual" : " rewrite test ([0-9]*%)$"
|
|
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
diff --git a/test2 b/test2
|
|
deleted file mode 100644
|
|
index $blob..0000000
|
|
--- a/test2
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-to be deleted
|
|
EOF
|
|
test_expect_success 'show deletion diff without -D' '
|
|
|
|
rm test2 &&
|
|
git diff -- test2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
diff --git a/test2 b/test2
|
|
deleted file mode 100644
|
|
index $blob..0000000
|
|
EOF
|
|
test_expect_success 'suppress deletion diff with -D' '
|
|
|
|
git diff -D -- test2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'show deletion diff with -B' '
|
|
|
|
git diff -B -- test >actual &&
|
|
grep "Linus Torvalds" actual
|
|
'
|
|
|
|
test_expect_success 'suppress deletion diff with -B -D' '
|
|
|
|
git diff -B -D -- test >actual &&
|
|
grep -v "Linus Torvalds" actual
|
|
'
|
|
|
|
test_expect_success 'prepare a file that ends with an incomplete line' '
|
|
test_seq 1 99 >seq &&
|
|
printf 100 >>seq &&
|
|
git add seq &&
|
|
git commit seq -m seq
|
|
'
|
|
|
|
test_expect_success 'rewrite the middle 90% of sequence file and terminate with newline' '
|
|
test_seq 1 5 >seq &&
|
|
test_seq 9331 9420 >>seq &&
|
|
test_seq 96 100 >>seq
|
|
'
|
|
|
|
test_expect_success 'confirm that sequence file is considered a rewrite' '
|
|
git diff -B seq >res &&
|
|
grep "dissimilarity index" res
|
|
'
|
|
|
|
test_expect_success 'no newline at eof is on its own line without -B' '
|
|
git diff seq >res &&
|
|
grep "^\\\\ " res &&
|
|
! grep "^..*\\\\ " res
|
|
'
|
|
|
|
test_expect_success 'no newline at eof is on its own line with -B' '
|
|
git diff -B seq >res &&
|
|
grep "^\\\\ " res &&
|
|
! grep "^..*\\\\ " res
|
|
'
|
|
|
|
test_done
|
|
|