Skip to content

Improvements related to directories #28

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
mernst merged 16 commits into from
Jan 13, 2026
Merged

Improvements related to directories #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
337761a
Add diagnostics
mernst Jan 12, 2026
62b1080
Don't show path to script
mernst Jan 12, 2026
d90355d
Merge ../git-scripts into regression
mernst Jan 12, 2026
c22661c
Merge ../git-scripts into script-name
mernst Jan 12, 2026
9df9dfd
Merge ../git-scripts into script-name
mernst Jan 13, 2026
721d093
Merge ../git-scripts-branch-script-name into regression
mernst Jan 13, 2026
2f449e1
Use in more places
mernst Jan 13, 2026
801174b
Merge ../git-scripts-branch-script-name into regression
mernst Jan 13, 2026
2d57831
Merge ../git-scripts into regression
mernst Jan 13, 2026
2d4cbed
script name
mernst Jan 13, 2026
a029a9f
Improve formatting
mernst Jan 13, 2026
593b105
Merge ../git-scripts into regression
mernst Jan 13, 2026
c88edbf
Merge ../git-scripts into regression
mernst Jan 13, 2026
aba4b8e
Merge ../git-scripts into regression
mernst Jan 13, 2026
e0a26ca
Add line break
mernst Jan 13, 2026
e4d43dc
Merge ../git-scripts into regression
mernst Jan 13, 2026
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 git-clone-related
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ if [ -n "$DEBUG" ]; then
echo "Entering ${SCRIPT_NAME} $UPSTREAM_ORG $REPO_NAME $DESTINATION $*"
fi

echo "In directory $(pwd) :"
echo "In directory ${PWD} :"
if [ -d "${DESTINATION}" ]; then
echo "${SCRIPT_NAME}: destination ${DESTINATION} exists; pulling"
# Use "cd" because older versions of git (eg, CircleCI) don't support the -C command-line option.
Expand Down
15 changes: 9 additions & 6 deletions tests/git-clone-related-test/test-git-clone-related.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@ GOAL_BRANCH=$5

set -o errexit -o nounset
# set -o pipefail

# Display commands and their arguments as they are executed.
# set -x
# Display shell input lines as they are read.
# set -v

USER=${USER:-git-clone-related}
PLUME_SCRIPTS=$(cd ../../ && pwd -P)
startdir=$(mktemp -d 2> /dev/null || mktemp -d -t 'startdir')
resultdir=$(mktemp -d 2> /dev/null || mktemp -d -t 'resultdir')
GIT_SCRIPTS=$(cd ../../ && pwd -P)
startdir=$(mktemp -d --tmpdir test-git-clone-related-startdir-XXXXXX 2> /dev/null || mktemp -d 2> /dev/null)
resultdir=$(mktemp -d --tmpdir test-git-clone-related-resultdir-XXXXXX 2> /dev/null || mktemp -d 2> /dev/null)
rm -rf "$startdir" "$resultdir"

git clone --branch "$START_BRANCH" "$START_REPO" "$startdir" -q --single-branch --depth 1
Expand All @@ -37,21 +38,23 @@ unset TRAVIS
unset CIRCLE_COMPARE_URL
unset GITHUB_HEAD_REF

echo "$0: About to run: (cd $startdir && ${GIT_SCRIPTS}/git-clone-related $ARGS $resultdir)"
# shellcheck disable=SC2086 # $ARGS should not be quoted
(cd "$startdir" && "${PLUME_SCRIPTS}"/git-clone-related $ARGS "$resultdir")
(cd "$startdir" && "${GIT_SCRIPTS}"/git-clone-related $ARGS "$resultdir")
echo "$0: Done: (cd $startdir && ${GIT_SCRIPTS}/git-clone-related $ARGS $resultdir)"

clonedrepo=$(git -C "$resultdir" config --get remote.origin.url)
# git 2.22 and later has `git branch --show-current`; CircleCI doesn't have that version yet.
clonedbranch=$(git -C "$resultdir" rev-parse --abbrev-ref HEAD)

if [ "$clonedrepo" != "$GOAL_REPO" ]; then
echo "error: test-git-clone-related.sh \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
echo "error: expected repo $GOAL_REPO, got: $clonedrepo"
echo "error: expected repo $GOAL_REPO, got: $clonedrepo, in $resultdir"
exit 2
fi
if [ "$clonedbranch" != "$GOAL_BRANCH" ]; then
echo "error: test-git-clone-related.sh \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
echo "error: expected branch $GOAL_BRANCH, got: $clonedbranch"
echo "expected branch $GOAL_BRANCH, got $clonedbranch, in $resultdir"
exit 2
fi

Expand Down