mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
test: fix '&&' chaining
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain by adding " &&" at the end of line to the commands that need them. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2f139044f9
commit
02380389c6
|
@ -189,7 +189,7 @@ for args in "-w --stdin-paths" "--stdin-paths -w"; do
|
|||
done
|
||||
|
||||
test_expect_success 'corrupt tree' '
|
||||
echo abc >malformed-tree
|
||||
echo abc >malformed-tree &&
|
||||
test_must_fail git hash-object -t tree malformed-tree
|
||||
'
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ assert_blob_equals() {
|
|||
}
|
||||
|
||||
test_expect_success setup '
|
||||
cp -R "$TEST_DIRECTORY/t1013/objects" .git/
|
||||
cp -R "$TEST_DIRECTORY/t1013/objects" .git/ &&
|
||||
git --version
|
||||
'
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ cat > expect << EOF
|
|||
WhatEver = Second
|
||||
EOF
|
||||
test_expect_success 'similar section' '
|
||||
git config Cores.WhatEver Second
|
||||
git config Cores.WhatEver Second &&
|
||||
test_cmp expect .git/config
|
||||
'
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ test_expect_success 'setup reflog with alternating commits' '
|
|||
'
|
||||
|
||||
test_expect_success 'reflog shows all entries' '
|
||||
cat >expect <<-\EOF
|
||||
cat >expect <<-\EOF &&
|
||||
topic@{0} reset: moving to two
|
||||
topic@{1} reset: moving to one
|
||||
topic@{2} reset: moving to two
|
||||
|
|
|
@ -603,7 +603,7 @@ test_expect_success '#22a: core.worktree = GIT_DIR = .git dir' '
|
|||
# like case #6.
|
||||
|
||||
setup_repo 22a "$here/22a/.git" "" unset &&
|
||||
setup_repo 22ab . "" unset
|
||||
setup_repo 22ab . "" unset &&
|
||||
mkdir -p 22a/.git/sub 22a/sub &&
|
||||
mkdir -p 22ab/.git/sub 22ab/sub &&
|
||||
try_case 22a/.git unset . \
|
||||
|
@ -742,7 +742,7 @@ test_expect_success '#28: core.worktree and core.bare conflict (gitfile case)' '
|
|||
# Case #29: GIT_WORK_TREE(+core.worktree) overrides core.bare (gitfile case).
|
||||
test_expect_success '#29: setup' '
|
||||
setup_repo 29 non-existent gitfile true &&
|
||||
mkdir -p 29/sub/sub 29/wt/sub
|
||||
mkdir -p 29/sub/sub 29/wt/sub &&
|
||||
(
|
||||
cd 29 &&
|
||||
GIT_WORK_TREE="$here/29" &&
|
||||
|
|
|
@ -6,7 +6,7 @@ test_description='tests for ref^{stuff}'
|
|||
|
||||
test_expect_success 'setup' '
|
||||
echo blob >a-blob &&
|
||||
git tag -a -m blob blob-tag `git hash-object -w a-blob`
|
||||
git tag -a -m blob blob-tag `git hash-object -w a-blob` &&
|
||||
mkdir a-tree &&
|
||||
echo moreblobs >a-tree/another-blob &&
|
||||
git add . &&
|
||||
|
|
|
@ -389,7 +389,7 @@ test_expect_success 'abort notes merge' '
|
|||
test_must_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
|
||||
test_cmp /dev/null output &&
|
||||
# m has not moved (still == y)
|
||||
test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
|
||||
test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
|
||||
# Verify that other notes refs has not changed (w, x, y and z)
|
||||
verify_notes w &&
|
||||
verify_notes x &&
|
||||
|
@ -525,9 +525,9 @@ EOF
|
|||
test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
|
||||
test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
|
||||
# Refs are unchanged
|
||||
test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
|
||||
test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)"
|
||||
test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)"
|
||||
test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
|
||||
test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
|
||||
test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
|
||||
# Mention refs/notes/m, and its current and expected value in output
|
||||
grep -q "refs/notes/m" output &&
|
||||
grep -q "$(git rev-parse refs/notes/m)" output &&
|
||||
|
@ -545,7 +545,7 @@ test_expect_success 'resolve situation by aborting the notes merge' '
|
|||
test_must_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
|
||||
test_cmp /dev/null output &&
|
||||
# m has not moved (still == w)
|
||||
test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
|
||||
test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
|
||||
# Verify that other notes refs has not changed (w, x, y and z)
|
||||
verify_notes w &&
|
||||
verify_notes x &&
|
||||
|
|
|
@ -172,8 +172,8 @@ test_expect_success 'fail when upstream arg is missing and not configured' '
|
|||
|
||||
test_expect_success 'default to @{upstream} when upstream arg is missing' '
|
||||
git checkout -b default topic &&
|
||||
git config branch.default.remote .
|
||||
git config branch.default.merge refs/heads/master
|
||||
git config branch.default.remote . &&
|
||||
git config branch.default.merge refs/heads/master &&
|
||||
git rebase &&
|
||||
test "$(git rev-parse default~1)" = "$(git rev-parse master)"
|
||||
'
|
||||
|
|
|
@ -51,7 +51,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
|
|||
test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
|
||||
test_when_finished "rm -fr test-bin funny.was.run" &&
|
||||
mkdir test-bin &&
|
||||
cat >test-bin/git-merge-funny <<-EOF
|
||||
cat >test-bin/git-merge-funny <<-EOF &&
|
||||
#!$SHELL_PATH
|
||||
case "\$1" in --opt) ;; *) exit 2 ;; esac
|
||||
shift &&
|
||||
|
@ -77,7 +77,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
|
|||
test_expect_success 'rebase --continue remembers --rerere-autoupdate' '
|
||||
rm -fr .git/rebase-* &&
|
||||
git reset --hard commit-new-file-F3-on-topic-branch &&
|
||||
git checkout master
|
||||
git checkout master &&
|
||||
test_commit "commit-new-file-F3" F3 3 &&
|
||||
git config rerere.enabled true &&
|
||||
test_must_fail git rebase -m master topic &&
|
||||
|
|
|
@ -39,7 +39,7 @@ run()
|
|||
}
|
||||
|
||||
test_expect_success 'setup' '
|
||||
git commit --allow-empty -m initial
|
||||
git commit --allow-empty -m initial &&
|
||||
git tag root
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue