Skip to content

fix: update_from_template.sh fails on first run #156

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
blooop merged 2 commits into from
Apr 25, 2026
Merged

fix: update_from_template.sh fails on first run #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dafbd9
fix: update_from_template.sh fails on first run
blooop Apr 25, 2026
3620257
fix: scope git config to local repo, allow env var overrides
blooop Apr 25, 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
14 changes: 9 additions & 5 deletions scripts/update_from_template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
#! /bin/bash
set -eo pipefail

git config --global pull.rebase false
git remote add template https://github.com/blooop/python_template.git
TEMPLATE_URL="${TEMPLATE_URL:-https://github.com/blooop/python_template.git}"
BRANCH="${BRANCH:-feature/update_from_template}"

git config pull.rebase false
git remote remove template 2>/dev/null || true
git remote add template "$TEMPLATE_URL"
git fetch --all
git checkout main && git pull origin main
git checkout -B feature/update_from_template; git pull
git checkout -B "$BRANCH"
git merge template/main --allow-unrelated-histories -m 'feat: pull changes from remote template'
git checkout --ours pixi.lock
git checkout --ours pixi.lock 2>/dev/null || true

# regenerate lockfile to match merged pyproject.toml
pixi update
git add pixi.lock
git diff --cached --quiet || git commit -m 'chore: update pixi.lock after template merge'

git remote remove template
git push --set-upstream origin feature/update_from_template
git push --set-upstream origin "$BRANCH"
git checkout main
Loading