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>
115 lines
2.7 KiB
Bash
Executable File
115 lines
2.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='basic update-index tests
|
|
|
|
Tests for command-line parsing and basic operation.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'update-index --nonsense fails' '
|
|
test_must_fail git update-index --nonsense 2>msg &&
|
|
test -s msg
|
|
'
|
|
|
|
test_expect_success 'update-index --nonsense dumps usage' '
|
|
test_expect_code 129 git update-index --nonsense 2>err &&
|
|
test_grep "[Uu]sage: git update-index" err
|
|
'
|
|
|
|
test_expect_success 'update-index -h with corrupt index' '
|
|
mkdir broken &&
|
|
(
|
|
cd broken &&
|
|
git init &&
|
|
>.git/index &&
|
|
test_expect_code 129 git update-index -h >usage 2>&1
|
|
) &&
|
|
test_grep "[Uu]sage: git update-index" broken/usage
|
|
'
|
|
|
|
test_expect_success '--cacheinfo complains of missing arguments' '
|
|
test_must_fail git update-index --cacheinfo
|
|
'
|
|
|
|
test_expect_success '--cacheinfo does not accept blob null sha1' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git rev-parse :file >expect &&
|
|
test_must_fail git update-index --verbose --cacheinfo 100644 $ZERO_OID file >out &&
|
|
git rev-parse :file >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
add '\''file'\''
|
|
EOF
|
|
test_cmp expect out
|
|
'
|
|
|
|
test_expect_success '--cacheinfo does not accept gitlink null sha1' '
|
|
git init submodule &&
|
|
(cd submodule && test_commit foo) &&
|
|
git add submodule &&
|
|
git rev-parse :submodule >expect &&
|
|
test_must_fail git update-index --cacheinfo 160000 $ZERO_OID submodule &&
|
|
git rev-parse :submodule >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--cacheinfo mode,sha1,path (new syntax)' '
|
|
echo content >file &&
|
|
git hash-object -w --stdin <file >expect &&
|
|
|
|
git update-index --add --cacheinfo 100644 "$(cat expect)" file &&
|
|
git rev-parse :file >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
git update-index --add --verbose --cacheinfo "100644,$(cat expect),elif" >out &&
|
|
git rev-parse :elif >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
add '\''elif'\''
|
|
EOF
|
|
test_cmp expect out
|
|
'
|
|
|
|
test_expect_success '.lock files cleaned up' '
|
|
mkdir cleanup &&
|
|
(
|
|
cd cleanup &&
|
|
mkdir worktree &&
|
|
git init repo &&
|
|
cd repo &&
|
|
git config core.worktree ../../worktree &&
|
|
# --refresh triggers late setup_work_tree,
|
|
# the_index.cache_changed is zero, rollback_lock_file fails
|
|
git update-index --refresh --verbose >out &&
|
|
test_must_be_empty out &&
|
|
! test -f .git/index.lock
|
|
)
|
|
'
|
|
|
|
test_expect_success '--chmod=+x and chmod=-x in the same argument list' '
|
|
>A &&
|
|
>B &&
|
|
git add A B &&
|
|
git update-index --verbose --chmod=+x A --chmod=-x B >out &&
|
|
cat >expect <<-\EOF &&
|
|
add '\''A'\''
|
|
chmod +x '\''A'\''
|
|
add '\''B'\''
|
|
chmod -x '\''B'\''
|
|
EOF
|
|
test_cmp expect out &&
|
|
|
|
cat >expect <<-EOF &&
|
|
100755 $EMPTY_BLOB 0 A
|
|
100644 $EMPTY_BLOB 0 B
|
|
EOF
|
|
git ls-files --stage A B >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|