global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 14:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: use t/diff-lib/* consistently

Browse Source 
The idea of copying README and COPYING into t/diff-lib/ was to step away
from using files from outside t/ in tests. Let's really make sure that
we use the files from t/diff-lib/ instead of other versions of those
files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2017-08-05 13:44:17 +02:00
parent c77f5a2e29
commit 44419b6db0
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t4022-diff-rewrite.sh
View File

@@ -6,12 +6,12 @@ test_description='rewrite diff'
test_expect_success setup '
cat "$TEST_DIRECTORY"/../COPYING >test &&
cat "$TEST_DIRECTORY"/diff-lib/COPYING >test &&
git add test &&
tr \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
<"$TEST_DIRECTORY"/../COPYING >test &&
<"$TEST_DIRECTORY"/diff-lib/COPYING >test &&
echo "to be deleted" >test2 &&
blob=$(git hash-object test2) &&
blob=$(git rev-parse --short $blob) &&

14
t/t4023-diff-rename-typechange.sh
View File

@@ -7,21 +7,21 @@ test_description='typechange rename detection'
test_expect_success setup '
rm -f foo bar &&
cat "$TEST_DIRECTORY"/../COPYING >foo &&
cat "$TEST_DIRECTORY"/diff-lib/COPYING >foo &&
test_ln_s_add linklink bar &&
git add foo &&
git commit -a -m Initial &&
git tag one &&
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../COPYING >bar &&
cat "$TEST_DIRECTORY"/diff-lib/COPYING >bar &&
test_ln_s_add linklink foo &&
git add bar &&
git commit -a -m Second &&
git tag two &&
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../COPYING >foo &&
cat "$TEST_DIRECTORY"/diff-lib/COPYING >foo &&
git add foo &&
git commit -a -m Third &&
git tag three &&
@@ -35,15 +35,15 @@ test_expect_success setup '
# This is purely for sanity check
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../COPYING >foo &&
cat "$TEST_DIRECTORY"/../Makefile >bar &&
cat "$TEST_DIRECTORY"/diff-lib/COPYING >foo &&
cat "$TEST_DIRECTORY"/diff-lib/README >bar &&
git add foo bar &&
git commit -a -m Fifth &&
git tag five &&
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../Makefile >foo &&
cat "$TEST_DIRECTORY"/../COPYING >bar &&
cat "$TEST_DIRECTORY"/diff-lib/README >foo &&
cat "$TEST_DIRECTORY"/diff-lib/COPYING >bar &&
git add foo bar &&
git commit -a -m Sixth &&
git tag six

4
t/t7001-mv.sh
View File

@@ -6,7 +6,7 @@ test_description='git mv in subdirs'
test_expect_success \
'prepare reference tree' \
'mkdir path0 path1 &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a'
@@ -108,7 +108,7 @@ test_expect_success \
test_expect_success \
'adding another file' \
'cp "$TEST_DIRECTORY"/../README.md path0/README &&
'cp "$TEST_DIRECTORY"/diff-lib/README path0/ &&
git add path0/README &&
git commit -m add2 -a'

2
t/t7060-wtstatus.sh
View File

@@ -62,7 +62,7 @@ EOF
test_expect_success 'rename & unmerged setup' '
git rm -f -r . &&
cat "$TEST_DIRECTORY/README" >ONE &&
cat "$TEST_DIRECTORY/diff-lib/README" >ONE &&
git add ONE &&
test_tick &&
git commit -m "One commit with ONE" &&

10
t/t7101-reset-empty-subdirs.sh
View File

@@ -9,7 +9,7 @@ test_description='git reset should cull empty subdirs'
test_expect_success \
'creating initial files' \
'mkdir path0 &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a'
@@ -17,10 +17,10 @@ test_expect_success \
'creating second files' \
'mkdir path1 &&
mkdir path1/path2 &&
cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
cp "$TEST_DIRECTORY"/../COPYING COPYING &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
cp "$TEST_DIRECTORY"/diff-lib/COPYING path1/path2/COPYING &&
cp "$TEST_DIRECTORY"/diff-lib/COPYING path1/COPYING &&
cp "$TEST_DIRECTORY"/diff-lib/COPYING COPYING &&
cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING-TOO &&
git add path1/path2/COPYING &&
git add path1/COPYING &&
git add COPYING &&