Skip to content

Remove execution-specific code in sourcing-only .sh files #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 1 commit into from
Jul 1, 2024
Merged

Remove execution-specific code in sourcing-only .sh files #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Must be sourced into the main journey test

function set-static-git-environment() {
set -a
Expand Down Expand Up @@ -66,4 +67,3 @@ function launch-git-daemon() {
done
trap 'kill $daemon_pid' EXIT
}

1 change: 0 additions & 1 deletion tests/journey/ein.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
1 change: 0 additions & 1 deletion tests/journey/gix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Must be sourced into the main journey test
set -eu

title plumbing "${kind}"
snapshot="$snapshot/plumbing"
Expand Down
2 changes: 1 addition & 1 deletion tests/utilities.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 '')"
Expand Down