Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Jul 3, 2024
2 parents bf3d82a + 8a2f6b7 commit e2e8cf9
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/helpers.sh
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
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
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
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

0 comments on commit e2e8cf9

Please sign in to comment.