Merge pull request #1436 from EliahKagan/script-helpers

Byron · web-flow · commit 8a2f6b7bb909 · 2024-07-01T09:44:00.000+02:00
Remove execution-specific code in sourcing-only .sh files
diff --git a/tests/helpers.sh b/tests/helpers.sh
@@ -1,3 +1,4 @@
+# Must be sourced into the main journey test
 
 function set-static-git-environment() {
   set -a
@@ -66,4 +67,3 @@ function launch-git-daemon() {
     done
     trap 'kill $daemon_pid' EXIT
 }
-
diff --git a/tests/journey/ein.sh b/tests/journey/ein.sh
@@ -1,5 +1,4 @@
 # Must be sourced into the main journey test
-set -eu
 
 if test "$kind" = "max" || test "$kind" = "max-pure"; then
 title "Porcelain ${kind}"
diff --git a/tests/journey/gix.sh b/tests/journey/gix.sh
@@ -1,5 +1,4 @@
 # Must be sourced into the main journey test
-set -eu
 
 title plumbing "${kind}"
 snapshot="$snapshot/plumbing"
diff --git a/tests/utilities.sh b/tests/utilities.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# Must be sourced into the main journey test
 
 WHITE="$(tput setaf 9 2>/dev/null || echo -n '')"
 YELLOW="$(tput setaf 3 2>/dev/null || echo -n '')"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# Must be sourced into the main journey test`
`1`	`2`
`2`	`3`	`function set-static-git-environment() {`
`3`	`4`	`set -a`
`@@ -66,4 +67,3 @@ function launch-git-daemon() {`
`66`	`67`	`done`
`67`	`68`	`trap 'kill $daemon_pid' EXIT`
`68`	`69`	`}`
`69`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# Must be sourced into the main journey test`
`2`		`-set -eu`
`3`	`2`
`4`	`3`	`if test "$kind" = "max" \|\| test "$kind" = "max-pure"; then`
`5`	`4`	`title "Porcelain ${kind}"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env bash`
	`1`	`+# Must be sourced into the main journey test`
`2`	`2`
`3`	`3`	`WHITE="$(tput setaf 9 2>/dev/null \|\| echo -n '')"`
`4`	`4`	`YELLOW="$(tput setaf 3 2>/dev/null \|\| echo -n '')"`