mirror of
https://github.com/git/git
synced 2024-11-05 01:58:18 +00:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
104 lines
2.9 KiB
Bash
Executable file
104 lines
2.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='basic checkout-index tests
|
|
'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'checkout-index --gobbledegook' '
|
|
test_expect_code 129 git checkout-index --gobbledegook 2>err &&
|
|
test_grep "[Uu]sage" err
|
|
'
|
|
|
|
test_expect_success 'checkout-index -h in broken repository' '
|
|
mkdir broken &&
|
|
(
|
|
cd broken &&
|
|
git init &&
|
|
>.git/index &&
|
|
test_expect_code 129 git checkout-index -h >usage 2>&1
|
|
) &&
|
|
test_grep "[Uu]sage" broken/usage
|
|
'
|
|
|
|
test_expect_success 'checkout-index reports errors (cmdline)' '
|
|
test_must_fail git checkout-index -- does-not-exist 2>stderr &&
|
|
test_grep not.in.the.cache stderr
|
|
'
|
|
|
|
test_expect_success 'checkout-index reports errors (stdin)' '
|
|
echo does-not-exist |
|
|
test_must_fail git checkout-index --stdin 2>stderr &&
|
|
test_grep not.in.the.cache stderr
|
|
'
|
|
for mode in 'case' 'utf-8'
|
|
do
|
|
case "$mode" in
|
|
case) dir='A' symlink='a' mode_prereq='CASE_INSENSITIVE_FS' ;;
|
|
utf-8)
|
|
dir=$(printf "\141\314\210") symlink=$(printf "\303\244")
|
|
mode_prereq='UTF8_NFD_TO_NFC' ;;
|
|
esac
|
|
|
|
test_expect_success SYMLINKS,$mode_prereq \
|
|
"checkout-index with $mode-collision don't write to the wrong place" '
|
|
git init $mode-collision &&
|
|
(
|
|
cd $mode-collision &&
|
|
mkdir target-dir &&
|
|
|
|
empty_obj_hex=$(git hash-object -w --stdin </dev/null) &&
|
|
symlink_hex=$(printf "%s" "$PWD/target-dir" | git hash-object -w --stdin) &&
|
|
|
|
cat >objs <<-EOF &&
|
|
100644 blob ${empty_obj_hex} ${dir}/x
|
|
100644 blob ${empty_obj_hex} ${dir}/y
|
|
100644 blob ${empty_obj_hex} ${dir}/z
|
|
120000 blob ${symlink_hex} ${symlink}
|
|
EOF
|
|
|
|
git update-index --index-info <objs &&
|
|
|
|
# Note: the order is important here to exercise the
|
|
# case where the file at ${dir} has its type changed by
|
|
# the time Git tries to check out ${dir}/z.
|
|
#
|
|
# Also, we use core.precomposeUnicode=false because we
|
|
# want Git to treat the UTF-8 paths transparently on
|
|
# Mac OS, matching what is in the index.
|
|
#
|
|
git -c core.precomposeUnicode=false checkout-index -f \
|
|
${dir}/x ${dir}/y ${symlink} ${dir}/z &&
|
|
|
|
# Should not create ${dir}/z at ${symlink}/z
|
|
test_path_is_missing target-dir/z
|
|
|
|
)
|
|
'
|
|
done
|
|
|
|
test_expect_success 'checkout-index --temp correctly reports error on missing blobs' '
|
|
test_when_finished git reset --hard &&
|
|
missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
|
|
cat >objs <<-EOF &&
|
|
100644 $missing_blob file
|
|
120000 $missing_blob symlink
|
|
EOF
|
|
git update-index --index-info <objs &&
|
|
|
|
test_must_fail git checkout-index --temp symlink file 2>stderr &&
|
|
test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
|
|
test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
|
|
'
|
|
|
|
test_expect_success 'checkout-index --temp correctly reports error for submodules' '
|
|
git init sub &&
|
|
test_commit -C sub file &&
|
|
git submodule add ./sub &&
|
|
git commit -m sub &&
|
|
test_must_fail git checkout-index --temp sub 2>stderr &&
|
|
test_grep "cannot create temporary submodule sub" stderr
|
|
'
|
|
|
|
test_done
|