зеркало из https://github.com/microsoft/git.git
t1506: factor out test for "Did you mean..."
With the current code, it's a "'"'"'" jungle, and we test only 1 line of the 2 line response. Factor out and test both. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
d83a831bf4
Коммит
34df9abb41
|
@ -6,6 +6,13 @@ exec </dev/null
|
|||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_did_you_mean ()
|
||||
{
|
||||
printf "fatal: Path '$2$3' $4, but not ${5:-'$3'}.\n" >expected &&
|
||||
printf "Did you mean '$1:$2$3'?\n" >>expected &&
|
||||
test_cmp expected error
|
||||
}
|
||||
|
||||
HASH_file=
|
||||
|
||||
test_expect_success 'set up basic repo' '
|
||||
|
@ -106,7 +113,7 @@ test_expect_success 'incorrect file in sha1:path' '
|
|||
grep "fatal: Path '"'"'index-only.txt'"'"' exists on disk, but not in '"'"'HEAD'"'"'." error &&
|
||||
(cd subdir &&
|
||||
test_must_fail git rev-parse HEAD:file2.txt 2> error &&
|
||||
grep "Did you mean '"'"'HEAD:subdir/file2.txt'"'"'?" error )
|
||||
test_did_you_mean HEAD subdir/ file2.txt exists )
|
||||
'
|
||||
|
||||
test_expect_success 'incorrect file in :path and :N:path' '
|
||||
|
@ -115,14 +122,14 @@ test_expect_success 'incorrect file in :path and :N:path' '
|
|||
test_must_fail git rev-parse :1:nothing.txt 2> error &&
|
||||
grep "Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error &&
|
||||
test_must_fail git rev-parse :1:file.txt 2> error &&
|
||||
grep "Did you mean '"'"':0:file.txt'"'"'?" error &&
|
||||
test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
|
||||
(cd subdir &&
|
||||
test_must_fail git rev-parse :1:file.txt 2> error &&
|
||||
grep "Did you mean '"'"':0:file.txt'"'"'?" error &&
|
||||
test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
|
||||
test_must_fail git rev-parse :file2.txt 2> error &&
|
||||
grep "Did you mean '"'"':0:subdir/file2.txt'"'"'?" error &&
|
||||
test_did_you_mean ":0" subdir/ file2.txt "is in the index" &&
|
||||
test_must_fail git rev-parse :2:file2.txt 2> error &&
|
||||
grep "Did you mean '"'"':0:subdir/file2.txt'"'"'?" error) &&
|
||||
test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
|
||||
test_must_fail git rev-parse :disk-only.txt 2> error &&
|
||||
grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error
|
||||
'
|
||||
|
|
Загрузка…
Ссылка в новой задаче