mirror of
https://github.com/git/git.git
synced 2024-11-26 03:14:50 +08:00
bfdbee9810
Many test scripts assumed that they will start in a 'trash' subdirectory
that is a single level down from the t/ directory, and referred to their
test vector files by asking for files like "../t9999/expect". This will
break if we move the 'trash' subdirectory elsewhere.
To solve this, we earlier introduced "$TEST_DIRECTORY" so that they can
refer to t/ directory reliably. This finally makes all the tests use
it to refer to the outside environment.
With this patch, and a one-liner not included here (because it would
contradict with what Dscho really wants to do):
| diff --git a/t/test-lib.sh b/t/test-lib.sh
| index 70ea7e0..60e69e4 100644
| --- a/t/test-lib.sh
| +++ b/t/test-lib.sh
| @@ -485,7 +485,7 @@ fi
| . ../GIT-BUILD-OPTIONS
|
| # Test repository
| -test="trash directory"
| +test="trash directory/another level/yet another"
| rm -fr "$test" || {
| trap - exit
| echo >&5 "FATAL: Cannot prepare test area"
all the tests still pass, but we would want extra sets of eyeballs on this
type of change to really make sure.
[jc: with help from Stephan Beyer on http-push tests I do not run myself;
credits for locating silly quoting errors go to Olivier Marin.]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
81 lines
1.5 KiB
Bash
Executable File
81 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Test rename detection in diff engine.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
|
|
|
echo >path0 'Line 1
|
|
Line 2
|
|
Line 3
|
|
Line 4
|
|
Line 5
|
|
Line 6
|
|
Line 7
|
|
Line 8
|
|
Line 9
|
|
Line 10
|
|
line 11
|
|
Line 12
|
|
Line 13
|
|
Line 14
|
|
Line 15
|
|
'
|
|
|
|
test_expect_success \
|
|
'update-index --add a file.' \
|
|
'git update-index --add path0'
|
|
|
|
test_expect_success \
|
|
'write that tree.' \
|
|
'tree=$(git write-tree) && echo $tree'
|
|
|
|
sed -e 's/line/Line/' <path0 >path1
|
|
rm -f path0
|
|
test_expect_success \
|
|
'renamed and edited the file.' \
|
|
'git update-index --add --remove path0 path1'
|
|
|
|
test_expect_success \
|
|
'git diff-index -p -M after rename and editing.' \
|
|
'git diff-index -p -M $tree >current'
|
|
cat >expected <<\EOF
|
|
diff --git a/path0 b/path1
|
|
rename from path0
|
|
rename to path1
|
|
--- a/path0
|
|
+++ b/path1
|
|
@@ -8,7 +8,7 @@ Line 7
|
|
Line 8
|
|
Line 9
|
|
Line 10
|
|
-line 11
|
|
+Line 11
|
|
Line 12
|
|
Line 13
|
|
Line 14
|
|
EOF
|
|
|
|
test_expect_success \
|
|
'validate the output.' \
|
|
'compare_diff_patch current expected'
|
|
|
|
test_expect_success 'favour same basenames over different ones' '
|
|
cp path1 another-path &&
|
|
git add another-path &&
|
|
git commit -m 1 &&
|
|
git rm path1 &&
|
|
mkdir subdir &&
|
|
git mv another-path subdir/path1 &&
|
|
git status | grep "renamed: .*path1 -> subdir/path1"'
|
|
|
|
test_expect_success 'favour same basenames even with minor differences' '
|
|
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
|
|
git status | grep "renamed: .*path1 -> subdir/path1"'
|
|
|
|
test_done
|