]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/test-chain-lint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2022 00:24:15 +0000 (16:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2022 00:24:15 +0000 (16:24 -0800)
Broken &&-chains in the test scripts have been corrected.

* es/test-chain-lint:
  t6000-t9999: detect and signal failure within loop
  t5000-t5999: detect and signal failure within loop
  t4000-t4999: detect and signal failure within loop
  t0000-t3999: detect and signal failure within loop
  tests: simplify by dropping unnecessary `for` loops
  tests: apply modern idiom for exiting loop upon failure
  tests: apply modern idiom for signaling test failure
  tests: fix broken &&-chains in `{...}` groups
  tests: fix broken &&-chains in `$(...)` command substitutions
  tests: fix broken &&-chains in compound statements
  tests: use test_write_lines() to generate line-oriented output
  tests: simplify construction of large blocks of text
  t9107: use shell parameter expansion to avoid breaking &&-chain
  t6300: make `%(raw:size) --shell` test more robust
  t5516: drop unnecessary subshell and command invocation
  t4202: clarify intent by creating expected content less cleverly
  t1020: avoid aborting entire test script when one test fails
  t1010: fix unnoticed failure on Windows
  t/lib-pager: use sane_unset() to avoid breaking &&-chain

40 files changed:
1  2 
t/t0020-crlf.sh
t/t1006-cat-file.sh
t/t1300-config.sh
t/t1400-update-ref.sh
t/t1403-show-ref.sh
t/t2102-update-index-symlinks.sh
t/t2103-update-index-ignore-missing.sh
t/t2200-add-update.sh
t/t2201-add-update-typechange.sh
t/t3202-show-branch.sh
t/t3303-notes-subtrees.sh
t/t3305-notes-fanout.sh
t/t3404-rebase-interactive.sh
t/t4012-diff-binary.sh
t/t4024-diff-optimize-common.sh
t/t4046-diff-unmerged.sh
t/t4049-diff-stat-count.sh
t/t4105-apply-fuzz.sh
t/t4106-apply-stdin.sh
t/t4116-apply-reverse.sh
t/t4118-apply-empty-context.sh
t/t4123-apply-shrink.sh
t/t4126-apply-empty.sh
t/t4127-apply-same-fn.sh
t/t4202-log.sh
t/t4205-log-pretty-formats.sh
t/t4216-log-bloom.sh
t/t5307-pack-missing-commit.sh
t/t5310-pack-bitmaps.sh
t/t5319-multi-pack-index.sh
t/t5505-remote.sh
t/t5510-fetch.sh
t/t5516-fetch-push.sh
t/t5702-protocol-v2.sh
t/t6005-rev-list-count.sh
t/t6200-fmt-merge-msg.sh
t/t6300-for-each-ref.sh
t/t6407-merge-binary.sh
t/t7519-status-fsmonitor.sh
t/t9902-completion.sh

diff --cc t/t0020-crlf.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 82284d2f45d1f3f522111b11a0bcfbbbd3c075c9,7391a5a1d2807d0f9bc9dccfd7b5616a23e94ca6..33860d3829085211d5a5aa4da9468fa52cae4d9b
@@@ -11,12 -9,7 +11,9 @@@ test_expect_success setup 
        git add empty &&
        test_tick &&
        git commit -m initial &&
-       for i in a b c d e
-       do
-               echo $i
-       done >empty &&
 +      git commit --allow-empty -m "empty commit" &&
 +      git format-patch --always HEAD~ >empty.patch &&
+       test_write_lines a b c d e >empty &&
        cat empty >expect &&
        git diff |
        sed -e "/^diff --git/d" \
Simple merge
diff --cc t/t4202-log.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge