From 0cb79b86ad48c6fccae054a5716625dc29d17ed8 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 13 Aug 2025 17:17:09 -0400 Subject: [PATCH] - use git -C in subtrees script instead of pushd for better cross-OS compatibility --- tools/update-subtrees.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-subtrees.sh b/tools/update-subtrees.sh index 459eabdbf..14f1f145a 100755 --- a/tools/update-subtrees.sh +++ b/tools/update-subtrees.sh @@ -1,12 +1,12 @@ #!/bin/bash -pushd "$(git rev-parse --show-toplevel)" >/dev/null +export GITROOT="$(git rev-parse --show-toplevel)" pull() { if [[ "${1}" == "${2}" || "${1}" == "all" ]] then echo "fetching ${2}" - git subtree pull --prefix="${3}" "${4}" "${5}" --squash || exit + git -C $GITROOT subtree pull --prefix="${3}" "${4}" "${5}" --squash || exit else echo "${2} not specified, skipping" fi