From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b --- .../git/t/chainlint/arithmetic-expansion.expect | 9 ----- .../git/t/chainlint/arithmetic-expansion.test | 11 ------ third_party/git/t/chainlint/bash-array.expect | 10 ------ third_party/git/t/chainlint/bash-array.test | 12 ------- third_party/git/t/chainlint/blank-line.expect | 4 --- third_party/git/t/chainlint/blank-line.test | 10 ------ third_party/git/t/chainlint/block.expect | 12 ------- third_party/git/t/chainlint/block.test | 15 --------- third_party/git/t/chainlint/broken-chain.expect | 6 ---- third_party/git/t/chainlint/broken-chain.test | 8 ----- third_party/git/t/chainlint/case.expect | 19 ----------- third_party/git/t/chainlint/case.test | 23 ------------- .../close-nested-and-parent-together.expect | 4 --- .../close-nested-and-parent-together.test | 3 -- third_party/git/t/chainlint/close-subshell.expect | 25 -------------- third_party/git/t/chainlint/close-subshell.test | 27 --------------- .../git/t/chainlint/command-substitution.expect | 9 ----- .../git/t/chainlint/command-substitution.test | 11 ------ third_party/git/t/chainlint/comment.expect | 4 --- third_party/git/t/chainlint/comment.test | 11 ------ .../t/chainlint/complex-if-in-cuddled-loop.expect | 10 ------ .../t/chainlint/complex-if-in-cuddled-loop.test | 11 ------ .../git/t/chainlint/cuddled-if-then-else.expect | 7 ---- .../git/t/chainlint/cuddled-if-then-else.test | 7 ---- third_party/git/t/chainlint/cuddled-loop.expect | 5 --- third_party/git/t/chainlint/cuddled-loop.test | 7 ---- third_party/git/t/chainlint/cuddled.expect | 21 ------------ third_party/git/t/chainlint/cuddled.test | 23 ------------- third_party/git/t/chainlint/exit-loop.expect | 24 ------------- third_party/git/t/chainlint/exit-loop.test | 27 --------------- third_party/git/t/chainlint/exit-subshell.expect | 5 --- third_party/git/t/chainlint/exit-subshell.test | 6 ---- third_party/git/t/chainlint/for-loop.expect | 11 ------ third_party/git/t/chainlint/for-loop.test | 19 ----------- .../git/t/chainlint/here-doc-close-subshell.expect | 2 -- .../git/t/chainlint/here-doc-close-subshell.test | 5 --- .../here-doc-multi-line-command-subst.expect | 5 --- .../here-doc-multi-line-command-subst.test | 9 ----- .../t/chainlint/here-doc-multi-line-string.expect | 4 --- .../t/chainlint/here-doc-multi-line-string.test | 8 ----- third_party/git/t/chainlint/here-doc.expect | 9 ----- third_party/git/t/chainlint/here-doc.test | 37 -------------------- third_party/git/t/chainlint/if-in-loop.expect | 12 ------- third_party/git/t/chainlint/if-in-loop.test | 15 --------- third_party/git/t/chainlint/if-then-else.expect | 19 ----------- third_party/git/t/chainlint/if-then-else.test | 28 ---------------- third_party/git/t/chainlint/incomplete-line.expect | 4 --- third_party/git/t/chainlint/incomplete-line.test | 12 ------- third_party/git/t/chainlint/inline-comment.expect | 9 ----- third_party/git/t/chainlint/inline-comment.test | 12 ------- third_party/git/t/chainlint/loop-in-if.expect | 12 ------- third_party/git/t/chainlint/loop-in-if.test | 15 --------- .../multi-line-nested-command-substitution.expect | 18 ---------- .../multi-line-nested-command-substitution.test | 18 ---------- .../git/t/chainlint/multi-line-string.expect | 15 --------- third_party/git/t/chainlint/multi-line-string.test | 27 --------------- .../git/t/chainlint/negated-one-liner.expect | 5 --- third_party/git/t/chainlint/negated-one-liner.test | 7 ---- .../git/t/chainlint/nested-cuddled-subshell.expect | 19 ----------- .../git/t/chainlint/nested-cuddled-subshell.test | 31 ----------------- third_party/git/t/chainlint/nested-here-doc.expect | 7 ---- third_party/git/t/chainlint/nested-here-doc.test | 33 ------------------ .../git/t/chainlint/nested-subshell-comment.expect | 11 ------ .../git/t/chainlint/nested-subshell-comment.test | 13 -------- third_party/git/t/chainlint/nested-subshell.expect | 12 ------- third_party/git/t/chainlint/nested-subshell.test | 14 -------- third_party/git/t/chainlint/one-liner.expect | 9 ----- third_party/git/t/chainlint/one-liner.test | 12 ------- third_party/git/t/chainlint/p4-filespec.expect | 4 --- third_party/git/t/chainlint/p4-filespec.test | 5 --- third_party/git/t/chainlint/pipe.expect | 8 ----- third_party/git/t/chainlint/pipe.test | 12 ------- third_party/git/t/chainlint/semicolon.expect | 20 ----------- third_party/git/t/chainlint/semicolon.test | 25 -------------- .../git/t/chainlint/subshell-here-doc.expect | 11 ------ third_party/git/t/chainlint/subshell-here-doc.test | 39 ---------------------- .../git/t/chainlint/subshell-one-liner.expect | 14 -------- .../git/t/chainlint/subshell-one-liner.test | 24 ------------- third_party/git/t/chainlint/t7900-subtree.expect | 10 ------ third_party/git/t/chainlint/t7900-subtree.test | 22 ------------ third_party/git/t/chainlint/while-loop.expect | 11 ------ third_party/git/t/chainlint/while-loop.test | 19 ----------- 82 files changed, 1108 deletions(-) delete mode 100644 third_party/git/t/chainlint/arithmetic-expansion.expect delete mode 100644 third_party/git/t/chainlint/arithmetic-expansion.test delete mode 100644 third_party/git/t/chainlint/bash-array.expect delete mode 100644 third_party/git/t/chainlint/bash-array.test delete mode 100644 third_party/git/t/chainlint/blank-line.expect delete mode 100644 third_party/git/t/chainlint/blank-line.test delete mode 100644 third_party/git/t/chainlint/block.expect delete mode 100644 third_party/git/t/chainlint/block.test delete mode 100644 third_party/git/t/chainlint/broken-chain.expect delete mode 100644 third_party/git/t/chainlint/broken-chain.test delete mode 100644 third_party/git/t/chainlint/case.expect delete mode 100644 third_party/git/t/chainlint/case.test delete mode 100644 third_party/git/t/chainlint/close-nested-and-parent-together.expect delete mode 100644 third_party/git/t/chainlint/close-nested-and-parent-together.test delete mode 100644 third_party/git/t/chainlint/close-subshell.expect delete mode 100644 third_party/git/t/chainlint/close-subshell.test delete mode 100644 third_party/git/t/chainlint/command-substitution.expect delete mode 100644 third_party/git/t/chainlint/command-substitution.test delete mode 100644 third_party/git/t/chainlint/comment.expect delete mode 100644 third_party/git/t/chainlint/comment.test delete mode 100644 third_party/git/t/chainlint/complex-if-in-cuddled-loop.expect delete mode 100644 third_party/git/t/chainlint/complex-if-in-cuddled-loop.test delete mode 100644 third_party/git/t/chainlint/cuddled-if-then-else.expect delete mode 100644 third_party/git/t/chainlint/cuddled-if-then-else.test delete mode 100644 third_party/git/t/chainlint/cuddled-loop.expect delete mode 100644 third_party/git/t/chainlint/cuddled-loop.test delete mode 100644 third_party/git/t/chainlint/cuddled.expect delete mode 100644 third_party/git/t/chainlint/cuddled.test delete mode 100644 third_party/git/t/chainlint/exit-loop.expect delete mode 100644 third_party/git/t/chainlint/exit-loop.test delete mode 100644 third_party/git/t/chainlint/exit-subshell.expect delete mode 100644 third_party/git/t/chainlint/exit-subshell.test delete mode 100644 third_party/git/t/chainlint/for-loop.expect delete mode 100644 third_party/git/t/chainlint/for-loop.test delete mode 100644 third_party/git/t/chainlint/here-doc-close-subshell.expect delete mode 100644 third_party/git/t/chainlint/here-doc-close-subshell.test delete mode 100644 third_party/git/t/chainlint/here-doc-multi-line-command-subst.expect delete mode 100644 third_party/git/t/chainlint/here-doc-multi-line-command-subst.test delete mode 100644 third_party/git/t/chainlint/here-doc-multi-line-string.expect delete mode 100644 third_party/git/t/chainlint/here-doc-multi-line-string.test delete mode 100644 third_party/git/t/chainlint/here-doc.expect delete mode 100644 third_party/git/t/chainlint/here-doc.test delete mode 100644 third_party/git/t/chainlint/if-in-loop.expect delete mode 100644 third_party/git/t/chainlint/if-in-loop.test delete mode 100644 third_party/git/t/chainlint/if-then-else.expect delete mode 100644 third_party/git/t/chainlint/if-then-else.test delete mode 100644 third_party/git/t/chainlint/incomplete-line.expect delete mode 100644 third_party/git/t/chainlint/incomplete-line.test delete mode 100644 third_party/git/t/chainlint/inline-comment.expect delete mode 100644 third_party/git/t/chainlint/inline-comment.test delete mode 100644 third_party/git/t/chainlint/loop-in-if.expect delete mode 100644 third_party/git/t/chainlint/loop-in-if.test delete mode 100644 third_party/git/t/chainlint/multi-line-nested-command-substitution.expect delete mode 100644 third_party/git/t/chainlint/multi-line-nested-command-substitution.test delete mode 100644 third_party/git/t/chainlint/multi-line-string.expect delete mode 100644 third_party/git/t/chainlint/multi-line-string.test delete mode 100644 third_party/git/t/chainlint/negated-one-liner.expect delete mode 100644 third_party/git/t/chainlint/negated-one-liner.test delete mode 100644 third_party/git/t/chainlint/nested-cuddled-subshell.expect delete mode 100644 third_party/git/t/chainlint/nested-cuddled-subshell.test delete mode 100644 third_party/git/t/chainlint/nested-here-doc.expect delete mode 100644 third_party/git/t/chainlint/nested-here-doc.test delete mode 100644 third_party/git/t/chainlint/nested-subshell-comment.expect delete mode 100644 third_party/git/t/chainlint/nested-subshell-comment.test delete mode 100644 third_party/git/t/chainlint/nested-subshell.expect delete mode 100644 third_party/git/t/chainlint/nested-subshell.test delete mode 100644 third_party/git/t/chainlint/one-liner.expect delete mode 100644 third_party/git/t/chainlint/one-liner.test delete mode 100644 third_party/git/t/chainlint/p4-filespec.expect delete mode 100644 third_party/git/t/chainlint/p4-filespec.test delete mode 100644 third_party/git/t/chainlint/pipe.expect delete mode 100644 third_party/git/t/chainlint/pipe.test delete mode 100644 third_party/git/t/chainlint/semicolon.expect delete mode 100644 third_party/git/t/chainlint/semicolon.test delete mode 100644 third_party/git/t/chainlint/subshell-here-doc.expect delete mode 100644 third_party/git/t/chainlint/subshell-here-doc.test delete mode 100644 third_party/git/t/chainlint/subshell-one-liner.expect delete mode 100644 third_party/git/t/chainlint/subshell-one-liner.test delete mode 100644 third_party/git/t/chainlint/t7900-subtree.expect delete mode 100644 third_party/git/t/chainlint/t7900-subtree.test delete mode 100644 third_party/git/t/chainlint/while-loop.expect delete mode 100644 third_party/git/t/chainlint/while-loop.test (limited to 'third_party/git/t/chainlint') diff --git a/third_party/git/t/chainlint/arithmetic-expansion.expect b/third_party/git/t/chainlint/arithmetic-expansion.expect deleted file mode 100644 index 09457d319661..000000000000 --- a/third_party/git/t/chainlint/arithmetic-expansion.expect +++ /dev/null @@ -1,9 +0,0 @@ -( - foo && - bar=$((42 + 1)) && - baz ->) && -( -?!AMP?! bar=$((42 + 1)) - baz ->) diff --git a/third_party/git/t/chainlint/arithmetic-expansion.test b/third_party/git/t/chainlint/arithmetic-expansion.test deleted file mode 100644 index 16206960d8b0..000000000000 --- a/third_party/git/t/chainlint/arithmetic-expansion.test +++ /dev/null @@ -1,11 +0,0 @@ -( - foo && -# LINT: closing ")" of $((...)) not misinterpreted as subshell-closing ")" - bar=$((42 + 1)) && - baz -) && -( -# LINT: missing "&&" on $((...)) - bar=$((42 + 1)) - baz -) diff --git a/third_party/git/t/chainlint/bash-array.expect b/third_party/git/t/chainlint/bash-array.expect deleted file mode 100644 index c4a830d1c1d6..000000000000 --- a/third_party/git/t/chainlint/bash-array.expect +++ /dev/null @@ -1,10 +0,0 @@ -( - foo && - bar=(gumbo stumbo wumbo) && - baz ->) && -( - foo && - bar=${#bar[@]} && - baz ->) diff --git a/third_party/git/t/chainlint/bash-array.test b/third_party/git/t/chainlint/bash-array.test deleted file mode 100644 index 92bbb777b82a..000000000000 --- a/third_party/git/t/chainlint/bash-array.test +++ /dev/null @@ -1,12 +0,0 @@ -( - foo && -# LINT: ")" in Bash array assignment not misinterpreted as subshell-closing ")" - bar=(gumbo stumbo wumbo) && - baz -) && -( - foo && -# LINT: Bash array length operator not misinterpreted as comment - bar=${#bar[@]} && - baz -) diff --git a/third_party/git/t/chainlint/blank-line.expect b/third_party/git/t/chainlint/blank-line.expect deleted file mode 100644 index 3be939ed388c..000000000000 --- a/third_party/git/t/chainlint/blank-line.expect +++ /dev/null @@ -1,4 +0,0 @@ -( - nothing && - something ->) diff --git a/third_party/git/t/chainlint/blank-line.test b/third_party/git/t/chainlint/blank-line.test deleted file mode 100644 index f6dd14302b2b..000000000000 --- a/third_party/git/t/chainlint/blank-line.test +++ /dev/null @@ -1,10 +0,0 @@ -( - - nothing && - - something -# LINT: swallow blank lines since final _statement_ before subshell end is -# LINT: significant to "&&"-check, not final _line_ (which might be blank) - - -) diff --git a/third_party/git/t/chainlint/block.expect b/third_party/git/t/chainlint/block.expect deleted file mode 100644 index fed7e89ae8ff..000000000000 --- a/third_party/git/t/chainlint/block.expect +++ /dev/null @@ -1,12 +0,0 @@ -( - foo && - { - echo a - echo b - } && - bar && - { - echo c -?!AMP?! } - baz ->) diff --git a/third_party/git/t/chainlint/block.test b/third_party/git/t/chainlint/block.test deleted file mode 100644 index d859151af1d9..000000000000 --- a/third_party/git/t/chainlint/block.test +++ /dev/null @@ -1,15 +0,0 @@ -( -# LINT: missing "&&" in block not currently detected (for consistency with -# LINT: --chain-lint at top level and to provide escape hatch if needed) - foo && - { - echo a - echo b - } && - bar && -# LINT: missing "&&" at closing "}" - { - echo c - } - baz -) diff --git a/third_party/git/t/chainlint/broken-chain.expect b/third_party/git/t/chainlint/broken-chain.expect deleted file mode 100644 index 55b0f42a534d..000000000000 --- a/third_party/git/t/chainlint/broken-chain.expect +++ /dev/null @@ -1,6 +0,0 @@ -( - foo && -?!AMP?! bar - baz && - wop ->) diff --git a/third_party/git/t/chainlint/broken-chain.test b/third_party/git/t/chainlint/broken-chain.test deleted file mode 100644 index 3cc67b65d0c9..000000000000 --- a/third_party/git/t/chainlint/broken-chain.test +++ /dev/null @@ -1,8 +0,0 @@ -( - foo && -# LINT: missing "&&" from 'bar' - bar - baz && -# LINT: final statement before closing ")" legitimately lacks "&&" - wop -) diff --git a/third_party/git/t/chainlint/case.expect b/third_party/git/t/chainlint/case.expect deleted file mode 100644 index 41f121fbbf9c..000000000000 --- a/third_party/git/t/chainlint/case.expect +++ /dev/null @@ -1,19 +0,0 @@ -( - case "$x" in - x) foo ;; - *) bar ;; - esac && - foobar ->) && -( - case "$x" in - x) foo ;; - *) bar ;; -?!AMP?! esac - foobar ->) && -( - case "$x" in 1) true;; esac && -?!AMP?! case "$y" in 2) false;; esac - foobar ->) diff --git a/third_party/git/t/chainlint/case.test b/third_party/git/t/chainlint/case.test deleted file mode 100644 index 5ef6ff7db5ea..000000000000 --- a/third_party/git/t/chainlint/case.test +++ /dev/null @@ -1,23 +0,0 @@ -( -# LINT: "...)" arms in 'case' not misinterpreted as subshell-closing ")" - case "$x" in - x) foo ;; - *) bar ;; - esac && - foobar -) && -( -# LINT: missing "&&" on 'esac' - case "$x" in - x) foo ;; - *) bar ;; - esac - foobar -) && -( -# LINT: "...)" arm in one-liner 'case' not misinterpreted as closing ")" - case "$x" in 1) true;; esac && -# LINT: same but missing "&&" - case "$y" in 2) false;; esac - foobar -) diff --git a/third_party/git/t/chainlint/close-nested-and-parent-together.expect b/third_party/git/t/chainlint/close-nested-and-parent-together.expect deleted file mode 100644 index 2a910f9d6660..000000000000 --- a/third_party/git/t/chainlint/close-nested-and-parent-together.expect +++ /dev/null @@ -1,4 +0,0 @@ -( -cd foo && - (bar && ->>> baz)) diff --git a/third_party/git/t/chainlint/close-nested-and-parent-together.test b/third_party/git/t/chainlint/close-nested-and-parent-together.test deleted file mode 100644 index 72d482f76dd2..000000000000 --- a/third_party/git/t/chainlint/close-nested-and-parent-together.test +++ /dev/null @@ -1,3 +0,0 @@ -(cd foo && - (bar && - baz)) diff --git a/third_party/git/t/chainlint/close-subshell.expect b/third_party/git/t/chainlint/close-subshell.expect deleted file mode 100644 index 184688718a9c..000000000000 --- a/third_party/git/t/chainlint/close-subshell.expect +++ /dev/null @@ -1,25 +0,0 @@ -( - foo ->) && -( - bar ->) >out && -( - baz ->) 2>err && -( - boo ->) ) | wuzzle && -( - bop ->) | fazz fozz && -( - bup ->) | -fuzzle && -( - yop ->) diff --git a/third_party/git/t/chainlint/close-subshell.test b/third_party/git/t/chainlint/close-subshell.test deleted file mode 100644 index 508ca447fd6c..000000000000 --- a/third_party/git/t/chainlint/close-subshell.test +++ /dev/null @@ -1,27 +0,0 @@ -# LINT: closing ")" with various decorations ("&&", ">", "|", etc.) -( - foo -) && -( - bar -) >out && -( - baz -) 2>err && -( - boo -) ) && -( -?!AMP?! bar=$(gobble blocks) - baz ->) diff --git a/third_party/git/t/chainlint/command-substitution.test b/third_party/git/t/chainlint/command-substitution.test deleted file mode 100644 index 3bbb002a4c74..000000000000 --- a/third_party/git/t/chainlint/command-substitution.test +++ /dev/null @@ -1,11 +0,0 @@ -( - foo && -# LINT: closing ")" of $(...) not misinterpreted as subshell-closing ")" - bar=$(gobble) && - baz -) && -( -# LINT: missing "&&" on $(...) - bar=$(gobble blocks) - baz -) diff --git a/third_party/git/t/chainlint/comment.expect b/third_party/git/t/chainlint/comment.expect deleted file mode 100644 index 3be939ed388c..000000000000 --- a/third_party/git/t/chainlint/comment.expect +++ /dev/null @@ -1,4 +0,0 @@ -( - nothing && - something ->) diff --git a/third_party/git/t/chainlint/comment.test b/third_party/git/t/chainlint/comment.test deleted file mode 100644 index 113c0c466f17..000000000000 --- a/third_party/git/t/chainlint/comment.test +++ /dev/null @@ -1,11 +0,0 @@ -( -# LINT: swallow comment lines - # comment 1 - nothing && - # comment 2 - something -# LINT: swallow comment lines since final _statement_ before subshell end is -# LINT: significant to "&&"-check, not final _line_ (which might be comment) - # comment 3 - # comment 4 -) diff --git a/third_party/git/t/chainlint/complex-if-in-cuddled-loop.expect b/third_party/git/t/chainlint/complex-if-in-cuddled-loop.expect deleted file mode 100644 index 9674b88cf252..000000000000 --- a/third_party/git/t/chainlint/complex-if-in-cuddled-loop.expect +++ /dev/null @@ -1,10 +0,0 @@ -( -for i in a b c; do - if test "$(echo $(waffle bat))" = "eleventeen" && - test "$x" = "$y"; then - : - else - echo >file - fi -> done) && -test ! -f file diff --git a/third_party/git/t/chainlint/complex-if-in-cuddled-loop.test b/third_party/git/t/chainlint/complex-if-in-cuddled-loop.test deleted file mode 100644 index 571bbd85cdfc..000000000000 --- a/third_party/git/t/chainlint/complex-if-in-cuddled-loop.test +++ /dev/null @@ -1,11 +0,0 @@ -# LINT: 'for' loop cuddled with "(" and ")" and nested 'if' with complex -# LINT: multi-line condition; indented with spaces, not tabs -(for i in a b c; do - if test "$(echo $(waffle bat))" = "eleventeen" && - test "$x" = "$y"; then - : - else - echo >file - fi - done) && -test ! -f file diff --git a/third_party/git/t/chainlint/cuddled-if-then-else.expect b/third_party/git/t/chainlint/cuddled-if-then-else.expect deleted file mode 100644 index ab2a026fbc2f..000000000000 --- a/third_party/git/t/chainlint/cuddled-if-then-else.expect +++ /dev/null @@ -1,7 +0,0 @@ -( -if test -z ""; then - echo empty - else - echo bizzy -> fi) && -echo foobar diff --git a/third_party/git/t/chainlint/cuddled-if-then-else.test b/third_party/git/t/chainlint/cuddled-if-then-else.test deleted file mode 100644 index eed774a9d643..000000000000 --- a/third_party/git/t/chainlint/cuddled-if-then-else.test +++ /dev/null @@ -1,7 +0,0 @@ -# LINT: 'if' cuddled with "(" and ")"; indented with spaces, not tabs -(if test -z ""; then - echo empty - else - echo bizzy - fi) && -echo foobar diff --git a/third_party/git/t/chainlint/cuddled-loop.expect b/third_party/git/t/chainlint/cuddled-loop.expect deleted file mode 100644 index 8c0260d7f1d9..000000000000 --- a/third_party/git/t/chainlint/cuddled-loop.expect +++ /dev/null @@ -1,5 +0,0 @@ -( - while read x - do foobar bop || exit 1 -> done ) && - -( -?!AMP?!cd foo - bar ->) && - -( - cd foo && -> bar) && - -( -cd foo && -> bar) && - -( -?!AMP?!cd foo -> bar) diff --git a/third_party/git/t/chainlint/cuddled.test b/third_party/git/t/chainlint/cuddled.test deleted file mode 100644 index 0499fa418059..000000000000 --- a/third_party/git/t/chainlint/cuddled.test +++ /dev/null @@ -1,23 +0,0 @@ -# LINT: first subshell statement cuddled with opening "("; for implementation -# LINT: simplicity, "(..." is split into two lines, "(" and "..." -(cd foo && - bar -) && - -# LINT: same with missing "&&" -(cd foo - bar -) && - -# LINT: closing ")" cuddled with final subshell statement -( - cd foo && - bar) && - -# LINT: "(" and ")" cuddled with first and final subshell statements -(cd foo && - bar) && - -# LINT: same with missing "&&" -(cd foo - bar) diff --git a/third_party/git/t/chainlint/exit-loop.expect b/third_party/git/t/chainlint/exit-loop.expect deleted file mode 100644 index 84d8bdebc026..000000000000 --- a/third_party/git/t/chainlint/exit-loop.expect +++ /dev/null @@ -1,24 +0,0 @@ -( - for i in a b c - do - foo || exit 1 - bar && - baz - done ->) && -( - while true - do - foo || exit 1 - bar && - baz - done ->) && -( - i=0 && - while test $i -lt 10 - do - echo $i || exit - i=$(($i + 1)) - done ->) diff --git a/third_party/git/t/chainlint/exit-loop.test b/third_party/git/t/chainlint/exit-loop.test deleted file mode 100644 index 2f038207e194..000000000000 --- a/third_party/git/t/chainlint/exit-loop.test +++ /dev/null @@ -1,27 +0,0 @@ -( - for i in a b c - do -# LINT: "|| exit {n}" valid for-loop escape in subshell; no "&&" needed - foo || exit 1 - bar && - baz - done -) && -( - while true - do -# LINT: "|| exit {n}" valid while-loop escape in subshell; no "&&" needed - foo || exit 1 - bar && - baz - done -) && -( - i=0 && - while test $i -lt 10 - do -# LINT: "|| exit" (sans exit code) valid escape in subshell; no "&&" needed - echo $i || exit - i=$(($i + 1)) - done -) diff --git a/third_party/git/t/chainlint/exit-subshell.expect b/third_party/git/t/chainlint/exit-subshell.expect deleted file mode 100644 index bf78454f74c8..000000000000 --- a/third_party/git/t/chainlint/exit-subshell.expect +++ /dev/null @@ -1,5 +0,0 @@ -( - foo || exit 1 - bar && - baz ->) diff --git a/third_party/git/t/chainlint/exit-subshell.test b/third_party/git/t/chainlint/exit-subshell.test deleted file mode 100644 index 4e6ab69b8867..000000000000 --- a/third_party/git/t/chainlint/exit-subshell.test +++ /dev/null @@ -1,6 +0,0 @@ -( -# LINT: "|| exit {n}" valid subshell escape without hurting &&-chain - foo || exit 1 - bar && - baz -) diff --git a/third_party/git/t/chainlint/for-loop.expect b/third_party/git/t/chainlint/for-loop.expect deleted file mode 100644 index c33cf56ee73a..000000000000 --- a/third_party/git/t/chainlint/for-loop.expect +++ /dev/null @@ -1,11 +0,0 @@ -( - for i in a b c - do -?!AMP?! echo $i - cat -?!AMP?! done - for i in a b c; do - echo $i && - cat $i - done ->) diff --git a/third_party/git/t/chainlint/for-loop.test b/third_party/git/t/chainlint/for-loop.test deleted file mode 100644 index 7db76262bc2e..000000000000 --- a/third_party/git/t/chainlint/for-loop.test +++ /dev/null @@ -1,19 +0,0 @@ -( -# LINT: 'for', 'do', 'done' do not need "&&" - for i in a b c - do -# LINT: missing "&&" on 'echo' - echo $i -# LINT: last statement of while does not need "&&" - cat <<-\EOF - bar - EOF -# LINT: missing "&&" on 'done' - done - -# LINT: 'do' on same line as 'for' - for i in a b c; do - echo $i && - cat $i - done -) diff --git a/third_party/git/t/chainlint/here-doc-close-subshell.expect b/third_party/git/t/chainlint/here-doc-close-subshell.expect deleted file mode 100644 index f011e335e5f1..000000000000 --- a/third_party/git/t/chainlint/here-doc-close-subshell.expect +++ /dev/null @@ -1,2 +0,0 @@ -( -> cat) diff --git a/third_party/git/t/chainlint/here-doc-close-subshell.test b/third_party/git/t/chainlint/here-doc-close-subshell.test deleted file mode 100644 index b857ff546765..000000000000 --- a/third_party/git/t/chainlint/here-doc-close-subshell.test +++ /dev/null @@ -1,5 +0,0 @@ -( -# LINT: line contains here-doc and closes nested subshell - cat <<-\INPUT) - fizz - INPUT diff --git a/third_party/git/t/chainlint/here-doc-multi-line-command-subst.expect b/third_party/git/t/chainlint/here-doc-multi-line-command-subst.expect deleted file mode 100644 index e5fb752d2fc2..000000000000 --- a/third_party/git/t/chainlint/here-doc-multi-line-command-subst.expect +++ /dev/null @@ -1,5 +0,0 @@ -( - x=$(bobble && -?!AMP?!>> wiffle) - echo $x ->) diff --git a/third_party/git/t/chainlint/here-doc-multi-line-command-subst.test b/third_party/git/t/chainlint/here-doc-multi-line-command-subst.test deleted file mode 100644 index 899bc5de8bce..000000000000 --- a/third_party/git/t/chainlint/here-doc-multi-line-command-subst.test +++ /dev/null @@ -1,9 +0,0 @@ -( -# LINT: line contains here-doc and opens multi-line $(...) - x=$(bobble <<-\END && - fossil - vegetable - END - wiffle) - echo $x -) diff --git a/third_party/git/t/chainlint/here-doc-multi-line-string.expect b/third_party/git/t/chainlint/here-doc-multi-line-string.expect deleted file mode 100644 index 32038a070c2a..000000000000 --- a/third_party/git/t/chainlint/here-doc-multi-line-string.expect +++ /dev/null @@ -1,4 +0,0 @@ -( -?!AMP?! cat && echo "multi-line string" - bap ->) diff --git a/third_party/git/t/chainlint/here-doc-multi-line-string.test b/third_party/git/t/chainlint/here-doc-multi-line-string.test deleted file mode 100644 index a53edbcc8d89..000000000000 --- a/third_party/git/t/chainlint/here-doc-multi-line-string.test +++ /dev/null @@ -1,8 +0,0 @@ -( -# LINT: line contains here-doc and opens multi-line string - cat <<-\TXT && echo "multi-line - string" - fizzle - TXT - bap -) diff --git a/third_party/git/t/chainlint/here-doc.expect b/third_party/git/t/chainlint/here-doc.expect deleted file mode 100644 index 534b065e38ba..000000000000 --- a/third_party/git/t/chainlint/here-doc.expect +++ /dev/null @@ -1,9 +0,0 @@ -boodle wobba gorgo snoot wafta snurb && - -cat >foo && - -cat >bar && - -cat >boo && - -horticulture diff --git a/third_party/git/t/chainlint/here-doc.test b/third_party/git/t/chainlint/here-doc.test deleted file mode 100644 index ad4ce8afd9b5..000000000000 --- a/third_party/git/t/chainlint/here-doc.test +++ /dev/null @@ -1,37 +0,0 @@ -# LINT: stitch together incomplete \-ending lines -# LINT: swallow here-doc to avoid false positives in content -boodle wobba \ - gorgo snoot \ - wafta snurb <foo && -snoz -boz -woz -Arbitrary_Tag_42 - -# LINT: swallow 'quoted' here-doc -cat <<'FUMP' >bar && -snoz -boz -woz -FUMP - -# LINT: swallow "quoted" here-doc -cat <<"zump" >boo && -snoz -boz -woz -zump - -# LINT: swallow here-doc (EOF is last line of test) -horticulture <<\EOF -gomez -morticia -wednesday -pugsly -EOF diff --git a/third_party/git/t/chainlint/if-in-loop.expect b/third_party/git/t/chainlint/if-in-loop.expect deleted file mode 100644 index 03d3ceb22d89..000000000000 --- a/third_party/git/t/chainlint/if-in-loop.expect +++ /dev/null @@ -1,12 +0,0 @@ -( - for i in a b c - do - if false - then -?!AMP?! echo "err" - exit 1 -?!AMP?! fi - foo -?!AMP?! done - bar ->) diff --git a/third_party/git/t/chainlint/if-in-loop.test b/third_party/git/t/chainlint/if-in-loop.test deleted file mode 100644 index daf22da16476..000000000000 --- a/third_party/git/t/chainlint/if-in-loop.test +++ /dev/null @@ -1,15 +0,0 @@ -( - for i in a b c - do - if false - then -# LINT: missing "&&" on 'echo' - echo "err" - exit 1 -# LINT: missing "&&" on 'fi' - fi - foo -# LINT: missing "&&" on 'done' - done - bar -) diff --git a/third_party/git/t/chainlint/if-then-else.expect b/third_party/git/t/chainlint/if-then-else.expect deleted file mode 100644 index 5953c7bfbc2e..000000000000 --- a/third_party/git/t/chainlint/if-then-else.expect +++ /dev/null @@ -1,19 +0,0 @@ -( - if test -n "" - then -?!AMP?! echo very - echo empty - elif test -z "" - echo foo - else - echo foo && - cat -?!AMP?! fi - echo poodle ->) && -( - if test -n ""; then - echo very && -?!AMP?! echo empty - if ->) diff --git a/third_party/git/t/chainlint/if-then-else.test b/third_party/git/t/chainlint/if-then-else.test deleted file mode 100644 index 9bd8e9a4c68c..000000000000 --- a/third_party/git/t/chainlint/if-then-else.test +++ /dev/null @@ -1,28 +0,0 @@ -( -# LINT: 'if', 'then', 'elif', 'else', 'fi' do not need "&&" - if test -n "" - then -# LINT: missing "&&" on 'echo' - echo very -# LINT: last statement before 'elif' does not need "&&" - echo empty - elif test -z "" -# LINT: last statement before 'else' does not need "&&" - echo foo - else - echo foo && -# LINT: last statement before 'fi' does not need "&&" - cat <<-\EOF - bar - EOF -# LINT: missing "&&" on 'fi' - fi - echo poodle -) && -( -# LINT: 'then' on same line as 'if' - if test -n ""; then - echo very && - echo empty - if -) diff --git a/third_party/git/t/chainlint/incomplete-line.expect b/third_party/git/t/chainlint/incomplete-line.expect deleted file mode 100644 index 2f3ebabdc286..000000000000 --- a/third_party/git/t/chainlint/incomplete-line.expect +++ /dev/null @@ -1,4 +0,0 @@ -line 1 line 2 line 3 line 4 && -( - line 5 line 6 line 7 line 8 ->) diff --git a/third_party/git/t/chainlint/incomplete-line.test b/third_party/git/t/chainlint/incomplete-line.test deleted file mode 100644 index d8566580839b..000000000000 --- a/third_party/git/t/chainlint/incomplete-line.test +++ /dev/null @@ -1,12 +0,0 @@ -# LINT: stitch together all incomplete \-ending lines -line 1 \ -line 2 \ -line 3 \ -line 4 && -( -# LINT: stitch together all incomplete \-ending lines (subshell) - line 5 \ - line 6 \ - line 7 \ - line 8 -) diff --git a/third_party/git/t/chainlint/inline-comment.expect b/third_party/git/t/chainlint/inline-comment.expect deleted file mode 100644 index fc9f250ac48e..000000000000 --- a/third_party/git/t/chainlint/inline-comment.expect +++ /dev/null @@ -1,9 +0,0 @@ -( - foobar && -?!AMP?! barfoo - flibble "not a # comment" ->) && - -( -cd foo && -> flibble "not a # comment") diff --git a/third_party/git/t/chainlint/inline-comment.test b/third_party/git/t/chainlint/inline-comment.test deleted file mode 100644 index 8f26856e775b..000000000000 --- a/third_party/git/t/chainlint/inline-comment.test +++ /dev/null @@ -1,12 +0,0 @@ -( -# LINT: swallow inline comment (leaving command intact) - foobar && # comment 1 -# LINT: mispositioned "&&" (correctly) swallowed with comment - barfoo # wrong position for && -# LINT: "#" in string not misinterpreted as comment - flibble "not a # comment" -) && - -# LINT: "#" in string in cuddled subshell not misinterpreted as comment -(cd foo && - flibble "not a # comment") diff --git a/third_party/git/t/chainlint/loop-in-if.expect b/third_party/git/t/chainlint/loop-in-if.expect deleted file mode 100644 index 088e622c3141..000000000000 --- a/third_party/git/t/chainlint/loop-in-if.expect +++ /dev/null @@ -1,12 +0,0 @@ -( - if true - then - while true - do -?!AMP?! echo "pop" - echo "glup" -?!AMP?! done - foo -?!AMP?! fi - bar ->) diff --git a/third_party/git/t/chainlint/loop-in-if.test b/third_party/git/t/chainlint/loop-in-if.test deleted file mode 100644 index 93e8ba8e4d9a..000000000000 --- a/third_party/git/t/chainlint/loop-in-if.test +++ /dev/null @@ -1,15 +0,0 @@ -( - if true - then - while true - do -# LINT: missing "&&" on 'echo' - echo "pop" - echo "glup" -# LINT: missing "&&" on 'done' - done - foo -# LINT: missing "&&" on 'fi' - fi - bar -) diff --git a/third_party/git/t/chainlint/multi-line-nested-command-substitution.expect b/third_party/git/t/chainlint/multi-line-nested-command-substitution.expect deleted file mode 100644 index 59b6c8b850a1..000000000000 --- a/third_party/git/t/chainlint/multi-line-nested-command-substitution.expect +++ /dev/null @@ -1,18 +0,0 @@ -( - foo && - x=$( - echo bar | - cat ->> ) && - echo ok ->) | -sort && -( - bar && - x=$(echo bar | - cat ->> ) && - y=$(echo baz | ->> fip) && - echo fail ->) diff --git a/third_party/git/t/chainlint/multi-line-nested-command-substitution.test b/third_party/git/t/chainlint/multi-line-nested-command-substitution.test deleted file mode 100644 index 300058341b6f..000000000000 --- a/third_party/git/t/chainlint/multi-line-nested-command-substitution.test +++ /dev/null @@ -1,18 +0,0 @@ -( - foo && - x=$( - echo bar | - cat - ) && - echo ok -) | -sort && -( - bar && - x=$(echo bar | - cat - ) && - y=$(echo baz | - fip) && - echo fail -) diff --git a/third_party/git/t/chainlint/multi-line-string.expect b/third_party/git/t/chainlint/multi-line-string.expect deleted file mode 100644 index 170cb5999322..000000000000 --- a/third_party/git/t/chainlint/multi-line-string.expect +++ /dev/null @@ -1,15 +0,0 @@ -( - x="line 1 line 2 line 3" && -?!AMP?! y='line 1 line2' - foobar ->) && -( - echo "there's nothing to see here" && - exit ->) && -( - echo "xyz" "abc def ghi" && - echo 'xyz' 'abc def ghi' && - echo 'xyz' "abc def ghi" && - barfoo ->) diff --git a/third_party/git/t/chainlint/multi-line-string.test b/third_party/git/t/chainlint/multi-line-string.test deleted file mode 100644 index 287ab8970548..000000000000 --- a/third_party/git/t/chainlint/multi-line-string.test +++ /dev/null @@ -1,27 +0,0 @@ -( - x="line 1 - line 2 - line 3" && -# LINT: missing "&&" on assignment - y='line 1 - line2' - foobar -) && -( -# LINT: apostrophe (in a contraction) within string not misinterpreted as -# LINT: starting multi-line single-quoted string - echo "there's nothing to see here" && - exit -) && -( - echo "xyz" "abc - def - ghi" && - echo 'xyz' 'abc - def - ghi' && - echo 'xyz' "abc - def - ghi" && - barfoo -) diff --git a/third_party/git/t/chainlint/negated-one-liner.expect b/third_party/git/t/chainlint/negated-one-liner.expect deleted file mode 100644 index cf18429d0397..000000000000 --- a/third_party/git/t/chainlint/negated-one-liner.expect +++ /dev/null @@ -1,5 +0,0 @@ -! (foo && bar) && -! (foo && bar) >baz && - -?!SEMI?!! (foo; bar) && -?!SEMI?!! (foo; bar) >baz diff --git a/third_party/git/t/chainlint/negated-one-liner.test b/third_party/git/t/chainlint/negated-one-liner.test deleted file mode 100644 index c9598e915307..000000000000 --- a/third_party/git/t/chainlint/negated-one-liner.test +++ /dev/null @@ -1,7 +0,0 @@ -# LINT: top-level one-liner subshell -! (foo && bar) && -! (foo && bar) >baz && - -# LINT: top-level one-liner subshell missing internal "&&" -! (foo; bar) && -! (foo; bar) >baz diff --git a/third_party/git/t/chainlint/nested-cuddled-subshell.expect b/third_party/git/t/chainlint/nested-cuddled-subshell.expect deleted file mode 100644 index c2a59ffc335c..000000000000 --- a/third_party/git/t/chainlint/nested-cuddled-subshell.expect +++ /dev/null @@ -1,19 +0,0 @@ -( - (cd foo && - bar ->> ) && - (cd foo && - bar -?!AMP?!>> ) - ( - cd foo && ->> bar) && - ( - cd foo && -?!AMP?!>> bar) - (cd foo && ->> bar) && - (cd foo && -?!AMP?!>> bar) - foobar ->) diff --git a/third_party/git/t/chainlint/nested-cuddled-subshell.test b/third_party/git/t/chainlint/nested-cuddled-subshell.test deleted file mode 100644 index 8fd656c7b598..000000000000 --- a/third_party/git/t/chainlint/nested-cuddled-subshell.test +++ /dev/null @@ -1,31 +0,0 @@ -( -# LINT: opening "(" cuddled with first nested subshell statement - (cd foo && - bar - ) && - -# LINT: same but "&&" missing - (cd foo && - bar - ) - -# LINT: closing ")" cuddled with final nested subshell statement - ( - cd foo && - bar) && - -# LINT: same but "&&" missing - ( - cd foo && - bar) - -# LINT: "(" and ")" cuddled with first and final subshell statements - (cd foo && - bar) && - -# LINT: same but "&&" missing - (cd foo && - bar) - - foobar -) diff --git a/third_party/git/t/chainlint/nested-here-doc.expect b/third_party/git/t/chainlint/nested-here-doc.expect deleted file mode 100644 index 0c9ef1cfc695..000000000000 --- a/third_party/git/t/chainlint/nested-here-doc.expect +++ /dev/null @@ -1,7 +0,0 @@ -cat >foop && - -( - cat && -?!AMP?! cat - foobar ->) diff --git a/third_party/git/t/chainlint/nested-here-doc.test b/third_party/git/t/chainlint/nested-here-doc.test deleted file mode 100644 index f35404bf0f93..000000000000 --- a/third_party/git/t/chainlint/nested-here-doc.test +++ /dev/null @@ -1,33 +0,0 @@ -# LINT: inner "EOF" not misintrepreted as closing ARBITRARY here-doc -cat <foop && -naddle -fub <> ) - fuzzy ->) diff --git a/third_party/git/t/chainlint/nested-subshell-comment.test b/third_party/git/t/chainlint/nested-subshell-comment.test deleted file mode 100644 index 0ff136ab3cf1..000000000000 --- a/third_party/git/t/chainlint/nested-subshell-comment.test +++ /dev/null @@ -1,13 +0,0 @@ -( - foo && - ( - bar && -# LINT: ")" in comment in nested subshell not misinterpreted as closing ")" - # bottles wobble while fiddles gobble - # minor numbers of cows (or do they?) - baz && - snaff -# LINT: missing "&&" on ')' - ) - fuzzy -) diff --git a/third_party/git/t/chainlint/nested-subshell.expect b/third_party/git/t/chainlint/nested-subshell.expect deleted file mode 100644 index c8165ad19ec5..000000000000 --- a/third_party/git/t/chainlint/nested-subshell.expect +++ /dev/null @@ -1,12 +0,0 @@ -( - cd foo && - ( - echo a && - echo b ->> ) >file && - cd foo && - ( - echo a - echo b ->> ) >file ->) diff --git a/third_party/git/t/chainlint/nested-subshell.test b/third_party/git/t/chainlint/nested-subshell.test deleted file mode 100644 index 998b05a47d30..000000000000 --- a/third_party/git/t/chainlint/nested-subshell.test +++ /dev/null @@ -1,14 +0,0 @@ -( - cd foo && - ( - echo a && - echo b - ) >file && - - cd foo && - ( -# LINT: nested multi-line subshell not presently checked for missing "&&" - echo a - echo b - ) >file -) diff --git a/third_party/git/t/chainlint/one-liner.expect b/third_party/git/t/chainlint/one-liner.expect deleted file mode 100644 index 237f22734963..000000000000 --- a/third_party/git/t/chainlint/one-liner.expect +++ /dev/null @@ -1,9 +0,0 @@ -(foo && bar) && -(foo && bar) | -(foo && bar) >baz && - -?!SEMI?!(foo; bar) && -?!SEMI?!(foo; bar) | -?!SEMI?!(foo; bar) >baz - -(foo "bar; baz") diff --git a/third_party/git/t/chainlint/one-liner.test b/third_party/git/t/chainlint/one-liner.test deleted file mode 100644 index ec9acb98253d..000000000000 --- a/third_party/git/t/chainlint/one-liner.test +++ /dev/null @@ -1,12 +0,0 @@ -# LINT: top-level one-liner subshell -(foo && bar) && -(foo && bar) | -(foo && bar) >baz && - -# LINT: top-level one-liner subshell missing internal "&&" -(foo; bar) && -(foo; bar) | -(foo; bar) >baz - -# LINT: ";" in string not misinterpreted as broken &&-chain -(foo "bar; baz") diff --git a/third_party/git/t/chainlint/p4-filespec.expect b/third_party/git/t/chainlint/p4-filespec.expect deleted file mode 100644 index 98b3d881fda9..000000000000 --- a/third_party/git/t/chainlint/p4-filespec.expect +++ /dev/null @@ -1,4 +0,0 @@ -( - p4 print -1 //depot/fiddle#42 >file && - foobar ->) diff --git a/third_party/git/t/chainlint/p4-filespec.test b/third_party/git/t/chainlint/p4-filespec.test deleted file mode 100644 index 4fd2d6e2b80b..000000000000 --- a/third_party/git/t/chainlint/p4-filespec.test +++ /dev/null @@ -1,5 +0,0 @@ -( -# LINT: Perforce revspec in filespec not misinterpreted as in-line comment - p4 print -1 //depot/fiddle#42 >file && - foobar -) diff --git a/third_party/git/t/chainlint/pipe.expect b/third_party/git/t/chainlint/pipe.expect deleted file mode 100644 index 211b901dbc42..000000000000 --- a/third_party/git/t/chainlint/pipe.expect +++ /dev/null @@ -1,8 +0,0 @@ -( - foo | - bar | - baz && - fish | -?!AMP?! cow - sunder ->) diff --git a/third_party/git/t/chainlint/pipe.test b/third_party/git/t/chainlint/pipe.test deleted file mode 100644 index e6af4de91672..000000000000 --- a/third_party/git/t/chainlint/pipe.test +++ /dev/null @@ -1,12 +0,0 @@ -( -# LINT: no "&&" needed on line ending with "|" - foo | - bar | - baz && - -# LINT: final line of pipe sequence ('cow') lacking "&&" - fish | - cow - - sunder -) diff --git a/third_party/git/t/chainlint/semicolon.expect b/third_party/git/t/chainlint/semicolon.expect deleted file mode 100644 index 1d79384606d2..000000000000 --- a/third_party/git/t/chainlint/semicolon.expect +++ /dev/null @@ -1,20 +0,0 @@ -( -?!AMP?!?!SEMI?! cat foo ; echo bar -?!SEMI?! cat foo ; echo bar ->) && -( -?!SEMI?! cat foo ; echo bar && -?!SEMI?! cat foo ; echo bar ->) && -( - echo "foo; bar" && -?!SEMI?! cat foo; echo bar ->) && -( -?!SEMI?! foo; ->) && -( -cd foo && - for i in a b c; do -?!SEMI?! echo; -> done) diff --git a/third_party/git/t/chainlint/semicolon.test b/third_party/git/t/chainlint/semicolon.test deleted file mode 100644 index d82c8ebbc006..000000000000 --- a/third_party/git/t/chainlint/semicolon.test +++ /dev/null @@ -1,25 +0,0 @@ -( -# LINT: missing internal "&&" and ending "&&" - cat foo ; echo bar -# LINT: final statement before ")" only missing internal "&&" - cat foo ; echo bar -) && -( -# LINT: missing internal "&&" - cat foo ; echo bar && - cat foo ; echo bar -) && -( -# LINT: not fooled by semicolon in string - echo "foo; bar" && - cat foo; echo bar -) && -( -# LINT: unnecessary terminating semicolon - foo; -) && -(cd foo && - for i in a b c; do -# LINT: unnecessary terminating semicolon - echo; - done) diff --git a/third_party/git/t/chainlint/subshell-here-doc.expect b/third_party/git/t/chainlint/subshell-here-doc.expect deleted file mode 100644 index 74723e734043..000000000000 --- a/third_party/git/t/chainlint/subshell-here-doc.expect +++ /dev/null @@ -1,11 +0,0 @@ -( - echo wobba gorgo snoot wafta snurb && -?!AMP?! cat >bip - echo >bop ->) && -( - cat >bup && - cat >bup2 && - cat >bup3 && - meep ->) diff --git a/third_party/git/t/chainlint/subshell-here-doc.test b/third_party/git/t/chainlint/subshell-here-doc.test deleted file mode 100644 index f6b3ba4214a4..000000000000 --- a/third_party/git/t/chainlint/subshell-here-doc.test +++ /dev/null @@ -1,39 +0,0 @@ -( -# LINT: stitch together incomplete \-ending lines -# LINT: swallow here-doc to avoid false positives in content - echo wobba \ - gorgo snoot \ - wafta snurb <<-EOF && - quoth the raven, - nevermore... - EOF - -# LINT: missing "&&" on 'cat' - cat <bip - fish fly high - EOF - -# LINT: swallow here-doc (EOF is last line of subshell) - echo <<-\EOF >bop - gomez - morticia - wednesday - pugsly - EOF -) && -( -# LINT: swallow here-doc with arbitrary tag - cat <<-\ARBITRARY >bup && - glink - FIZZ - ARBITRARY - cat <<-'ARBITRARY2' >bup2 && - glink - FIZZ - ARBITRARY2 - cat <<-"ARBITRARY3" >bup3 && - glink - FIZZ - ARBITRARY3 - meep -) diff --git a/third_party/git/t/chainlint/subshell-one-liner.expect b/third_party/git/t/chainlint/subshell-one-liner.expect deleted file mode 100644 index 51162821d7e1..000000000000 --- a/third_party/git/t/chainlint/subshell-one-liner.expect +++ /dev/null @@ -1,14 +0,0 @@ -( - (foo && bar) && - (foo && bar) | - (foo && bar) >baz && -?!SEMI?! (foo; bar) && -?!SEMI?! (foo; bar) | -?!SEMI?! (foo; bar) >baz && - (foo || exit 1) && - (foo || exit 1) | - (foo || exit 1) >baz && -?!AMP?! (foo && bar) -?!AMP?!?!SEMI?! (foo && bar; baz) - foobar ->) diff --git a/third_party/git/t/chainlint/subshell-one-liner.test b/third_party/git/t/chainlint/subshell-one-liner.test deleted file mode 100644 index 37fa643c20a9..000000000000 --- a/third_party/git/t/chainlint/subshell-one-liner.test +++ /dev/null @@ -1,24 +0,0 @@ -( -# LINT: nested one-liner subshell - (foo && bar) && - (foo && bar) | - (foo && bar) >baz && - -# LINT: nested one-liner subshell missing internal "&&" - (foo; bar) && - (foo; bar) | - (foo; bar) >baz && - -# LINT: nested one-liner subshell with "|| exit" - (foo || exit 1) && - (foo || exit 1) | - (foo || exit 1) >baz && - -# LINT: nested one-liner subshell lacking ending "&&" - (foo && bar) - -# LINT: nested one-liner subshell missing internal "&&" and lacking ending "&&" - (foo && bar; baz) - - foobar -) diff --git a/third_party/git/t/chainlint/t7900-subtree.expect b/third_party/git/t/chainlint/t7900-subtree.expect deleted file mode 100644 index c9913429e64b..000000000000 --- a/third_party/git/t/chainlint/t7900-subtree.expect +++ /dev/null @@ -1,10 +0,0 @@ -( - chks="sub1sub2sub3sub4" && - chks_sub=$(cat | sed 's,^,sub dir/,' ->>) && - chkms="main-sub1main-sub2main-sub3main-sub4" && - chkms_sub=$(cat | sed 's,^,sub dir/,' ->>) && - subfiles=$(git ls-files) && - check_equal "$subfiles" "$chkms$chks" ->) diff --git a/third_party/git/t/chainlint/t7900-subtree.test b/third_party/git/t/chainlint/t7900-subtree.test deleted file mode 100644 index 277d8358dfd5..000000000000 --- a/third_party/git/t/chainlint/t7900-subtree.test +++ /dev/null @@ -1,22 +0,0 @@ -( - chks="sub1 -sub2 -sub3 -sub4" && - chks_sub=$(cat <) diff --git a/third_party/git/t/chainlint/while-loop.test b/third_party/git/t/chainlint/while-loop.test deleted file mode 100644 index f1df085bf03b..000000000000 --- a/third_party/git/t/chainlint/while-loop.test +++ /dev/null @@ -1,19 +0,0 @@ -( -# LINT: 'while, 'do', 'done' do not need "&&" - while true - do -# LINT: missing "&&" on 'echo' - echo foo -# LINT: last statement of while does not need "&&" - cat <<-\EOF - bar - EOF -# LINT: missing "&&" on 'done' - done - -# LINT: 'do' on same line as 'while' - while true; do - echo foo && - cat bar - done -) -- cgit 1.4.1