Git fork

Merge branch 'tc/t0450-harden'

Test updates.

* tc/t0450-harden:
t0450: add allowlist for builtins with missing .adoc
t0450: fix test for out-of-tree builds

+21 -3
+12 -3
t/t0450-txt-doc-vs-help.sh
··· 41 41 } 42 42 43 43 builtin_to_adoc () { 44 - echo "$GIT_BUILD_DIR/Documentation/git-$1.adoc" 44 + echo "$GIT_SOURCE_DIR/Documentation/git-$1.adoc" 45 45 } 46 46 47 47 adoc_to_synopsis () { ··· 112 112 adoc="$(builtin_to_adoc "$builtin")" && 113 113 preq="$(echo BUILTIN_ADOC_$builtin | tr '[:lower:]-' '[:upper:]_')" && 114 114 115 - if test -f "$adoc" 115 + # If and only if *.adoc is missing, builtin shall be listed in t0450/adoc-missing. 116 + if grep -q "^$builtin$" "$TEST_DIRECTORY"/t0450/adoc-missing 116 117 then 118 + test_expect_success "$builtin appropriately marked as not having .adoc" ' 119 + ! test -f "$adoc" 120 + ' 121 + else 117 122 test_set_prereq "$preq" 118 - fi && 123 + 124 + test_expect_success "$builtin appropriately marked as having .adoc" ' 125 + test -f "$adoc" 126 + ' 127 + fi 119 128 120 129 # *.adoc output assertions 121 130 test_expect_success "$preq" "$builtin *.adoc SYNOPSIS has dashed labels" '
+9
t/t0450/adoc-missing
··· 1 + checkout--worker 2 + merge-ours 3 + merge-recursive 4 + merge-recursive-ours 5 + merge-recursive-theirs 6 + merge-subtree 7 + pickaxe 8 + submodule--helper 9 + upload-archive--writer