pt/setup_env
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix stash: only pop if we actually stashed

Browse Source
This commit is contained in:
Paul Trowbridge 2026-05-11 20:04:11 -04:00
parent 83f95e1f3f
commit 369181e705
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install_nvchad.sh
View File

@ -46,9 +46,13 @@ if [ -d "$NVIM_CONFIG/.git" ]; then
EXISTING_REMOTE=$(git -C "$NVIM_CONFIG" remote get-url "$REMOTE_NAME" 2>/dev/null || echo "") EXISTING_REMOTE=$(git -C "$NVIM_CONFIG" remote get-url "$REMOTE_NAME" 2>/dev/null || echo "")
if [ "$EXISTING_REMOTE" = "$REPO" ]; then if [ "$EXISTING_REMOTE" = "$REPO" ]; then
echo "NvChad config already installed — pulling latest..." echo "NvChad config already installed — pulling latest..."
local stashed=false
if ! git -C "$NVIM_CONFIG" diff --quiet || ! git -C "$NVIM_CONFIG" diff --cached --quiet; then
git -C "$NVIM_CONFIG" stash git -C "$NVIM_CONFIG" stash
stashed=true
fi
git -C "$NVIM_CONFIG" pull "$REMOTE_NAME" "$BRANCH" git -C "$NVIM_CONFIG" pull "$REMOTE_NAME" "$BRANCH"
git -C "$NVIM_CONFIG" stash pop 2>/dev/null || true $stashed && git -C "$NVIM_CONFIG" stash pop || true
deploy_nvim deploy_nvim
echo "Done." echo "Done."
exit 0 exit 0