undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: don't lose misc "git" exit codes

Browse Source 
Fix a few miscellaneous cases where:

- We lost the "git" exit code via "git ... | grep"
- Likewise by having a $(git) argument to git itself
- Used "test -z" to check that a command emitted no output, we can use
  "test_must_be_empty" and &&-chaining instead.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2023-02-06 23:44:33 +01:00 committed by Junio C Hamano
parent 4bd0785dc2
commit 9fdc79ecba
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t1401-symbolic-ref.sh
View File

@ -33,7 +33,8 @@ test_expect_success 'symbolic-ref refuses non-ref for HEAD' '
reset_to_sane reset_to_sane
test_expect_success 'symbolic-ref refuses bare sha1' ' test_expect_success 'symbolic-ref refuses bare sha1' '
test_must_fail git symbolic-ref HEAD $(git rev-parse HEAD) rev=$(git rev-parse HEAD) &&
test_must_fail git symbolic-ref HEAD "$rev"
' '
reset_to_sane reset_to_sane

8
t/t3701-add-interactive.sh
View File

@ -296,9 +296,11 @@ test_expect_success FILEMODE 'stage mode and hunk' '
echo content >>file && echo content >>file &&
chmod +x file && chmod +x file &&
printf "y\\ny\\n" | git add -p && printf "y\\ny\\n" | git add -p &&
git diff --cached file | grep "new mode" && git diff --cached file >out &&
git diff --cached file | grep "+content" && grep "new mode" out &&
test -z "$(git diff file)" grep "+content" out &&
git diff file >out &&
test_must_be_empty out
' '
# end of tests disabled when filemode is not usable # end of tests disabled when filemode is not usable

3
t/t7516-commit-races.sh
View File

@ -10,7 +10,8 @@ test_expect_success 'race to create orphan commit' '
test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e && test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
git show -s --pretty=format:%s >subject && git show -s --pretty=format:%s >subject &&
grep hare subject && grep hare subject &&
test -z "$(git show -s --pretty=format:%P)" git show -s --pretty=format:%P >out &&
test_must_be_empty out
' '
test_expect_success 'race to create non-orphan commit' ' test_expect_success 'race to create non-orphan commit' '