mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +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>
70 lines
1.1 KiB
Bash
Executable file
70 lines
1.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git reset should work on unborn branch'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo a >a &&
|
|
echo b >b
|
|
'
|
|
|
|
test_expect_success 'reset' '
|
|
git add a b &&
|
|
git reset &&
|
|
|
|
git ls-files >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'reset HEAD' '
|
|
rm .git/index &&
|
|
git add a b &&
|
|
test_must_fail git reset HEAD
|
|
'
|
|
|
|
test_expect_success 'reset $file' '
|
|
rm .git/index &&
|
|
git add a b &&
|
|
git reset a &&
|
|
|
|
echo b >expect &&
|
|
git ls-files >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success PERL 'reset -p' '
|
|
rm .git/index &&
|
|
git add a &&
|
|
echo y >yes &&
|
|
git reset -p <yes >output &&
|
|
|
|
git ls-files >actual &&
|
|
test_must_be_empty actual &&
|
|
test_grep "Unstage" output
|
|
'
|
|
|
|
test_expect_success 'reset --soft is a no-op' '
|
|
rm .git/index &&
|
|
git add a &&
|
|
git reset --soft &&
|
|
|
|
echo a >expect &&
|
|
git ls-files >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'reset --hard' '
|
|
rm .git/index &&
|
|
git add a &&
|
|
test_when_finished "echo a >a" &&
|
|
git reset --hard &&
|
|
|
|
git ls-files >actual &&
|
|
test_must_be_empty actual &&
|
|
test_path_is_missing a
|
|
'
|
|
|
|
test_done
|