Skip to content

Enhance git2main for better worktree handling #5

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

Open
davidpricedev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Enhance git2main for better worktree handling #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1bb9bc
Enhance git2main for better worktree and stash handling
davidpricedev Apr 9, 2026
4d72ec0
fix the checkout
davidpricedev Apr 9, 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
47 changes: 30 additions & 17 deletions zsh/functions.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,38 @@ git-default-branch() {
}

###--- Switch to main safely ---###
git2main() {
local stashed=0
local default_branch
default_branch=$(git-default-branch)
# Check if there are any changes to stash
if ! git diff-index --quiet HEAD -- 2>/dev/null || [ -n "$(git ls-files --others --exclude-standard)" ]; then
echo "Stashing uncommitted changes..."
git stash push -u -m "git2main auto-stash $(date +%Y-%m-%d\ %H:%M:%S)"
stashed=1
fi
git2main() {
local stashed=0
local default_branch
default_branch=$(git-default-branch)

git fetch --all --prune && git switch "$default_branch" && git pull
# Check if there are multiple worktrees
local worktree_count
worktree_count=$(git worktree list | wc -l)

# Apply stash if changes were stashed
if [ "$stashed" -eq 1 ] && [ $? -eq 0 ]; then
echo "Applying stashed changes..."
git stash pop
fi
}
# Check if there are any changes to stash
if ! git diff-index --quiet HEAD -- 2>/dev/null || [ -n "$(git ls-files --others --exclude-standard)" ]; then
echo "Stashing uncommitted changes..."
git stash push -u -m "git2main auto-stash $(date +%Y-%m-%d\ %H:%M:%S)"
stashed=1
fi

git fetch --all --prune

# If multiple worktrees exist, checkout the origin SHA directly
if [ "$worktree_count" -gt 1 ]; then
echo "Multiple worktrees detected, checking out origin/$default_branch SHA..."
git checkout --detach "origin/$default_branch"
else
git switch "$default_branch" && git pull
fi

# Apply stash if changes were stashed and previous command succeeded
if [ "$stashed" -eq 1 ] && [ $? -eq 0 ]; then
echo "Applying stashed changes..."
git stash pop
fi
}

###--- Switch to new branch based on origin/main ---###
git2new() {
Expand Down