Merge pull request #406 from multica-ai/fix/setup-worktree-env-overwrite

fix: make setup-worktree preserve existing .env.worktree
This commit is contained in:
Jiayuan Zhang 2026-04-04 13:26:17 +08:00 committed by GitHub
commit 7883fe7bd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -98,8 +98,12 @@ check-main:
@ENV_FILE=$(MAIN_ENV_FILE) bash scripts/check.sh @ENV_FILE=$(MAIN_ENV_FILE) bash scripts/check.sh
setup-worktree: setup-worktree:
@echo "==> Generating $(WORKTREE_ENV_FILE) with unique ports..." @if [ ! -f "$(WORKTREE_ENV_FILE)" ]; then \
@FORCE=1 bash scripts/init-worktree-env.sh $(WORKTREE_ENV_FILE) echo "==> Generating $(WORKTREE_ENV_FILE) with unique ports..."; \
bash scripts/init-worktree-env.sh $(WORKTREE_ENV_FILE); \
else \
echo "==> Using existing $(WORKTREE_ENV_FILE)"; \
fi
@$(MAKE) setup ENV_FILE=$(WORKTREE_ENV_FILE) @$(MAKE) setup ENV_FILE=$(WORKTREE_ENV_FILE)
start-worktree: start-worktree: