Well, my full functions.sh won't fit in a comment, so here's 2 of my more unique functions that makes life a little easier when contributing to busy OSS projects:
# Git fork sync functions
# Assumes standard convention: origin = your fork, upstream = original repo
## Sync fork with upstream before starting work
gss() {
# Safety checks
if ! git rev-parse --git-dir >/dev/null 2>&1; then
echo "❌ Not in a git repository"
return 1
fi
# Check if we're in a git operation state
local git_dir=$(git rev-parse --git-dir)
if [[ -f "$git_dir/rebase-merge/interactive" ]] || [[ -d "$git_dir/rebase-apply" ]] || [[ -f "$git_dir/MERGE_HEAD" ]]; then
echo "❌ Git operation in progress. Complete or abort current rebase/merge first:"
echo " git rebase --continue (after resolving conflicts)"
echo " git rebase --abort (to cancel rebase)"
echo " git merge --abort (to cancel merge)"
return 1
fi
# Check for uncommitted changes
if ! git diff-index --quiet HEAD -- 2>/dev/null; then
echo "❌ You have uncommitted changes. Commit or stash them first:"
git status --porcelain
echo ""
echo "💡 Quick fix: git add . && git commit -m 'WIP' or git stash"
return 1
fi
# Check for required remotes
if ! git remote get-url upstream >/dev/null 2>&1; then
echo "❌ No 'upstream' remote found. Add it first:"
echo " git remote add upstream <upstream-repo-url>"
return 1
fi
if ! git remote get-url origin >/dev/null 2>&1; then
echo "❌ No 'origin' remote found. Add it first:"
echo " git remote add origin <your-fork-url>"
return 1
fi
local current_branch=$(git branch --show-current)
# Ensure we have a main branch locally
if ! git show-ref --verify --quiet refs/heads/main; then
echo "❌ No local 'main' branch found. Create it first:"
echo " git checkout -b main upstream/main"
return 1
fi
echo "🔄 Syncing fork with upstream..."
echo " Current branch: $current_branch"
# Fetch with error handling
if ! git fetch upstream; then
echo "❌ Failed to fetch from upstream. Check network connection and remote URL."
return 1
fi
echo "📌 Updating local main..."
if ! git checkout main; then
echo "❌ Failed to checkout main branch"
return 1
fi
if ! git reset --hard upstream/main; then
echo "❌ Failed to reset main to upstream/main"
return 1
fi
echo "⬆️ Pushing updated main to fork..."
if ! git push origin main; then
echo "❌ Failed to push main to origin. Check push permissions."
return 1
fi
echo "🔀 Rebasing feature branch on updated main..."
if ! git checkout "$current_branch"; then
echo "❌ Failed to checkout $current_branch"
return 1
fi
if ! git rebase main; then
echo "❌ Rebase failed due to conflicts. Resolve them and continue:"
echo " 1. Edit conflicted files"
echo " 2. git add <resolved-files>"
echo " 3. git rebase --continue"
echo " Or: git rebase --abort to cancel"
return 1
fi
echo "✅ Ready to work on branch: $current_branch"
}
## Sync fork and push feature branch
gsp() {
# Safety checks
if ! git rev-parse --git-dir >/dev/null 2>&1; then
echo "❌ Not in a git repository"
return 1
fi
local git_dir=$(git rev-parse --git-dir)
if [[ -f "$git_dir/rebase-merge/interactive" ]] || [[ -d "$git_dir/rebase-apply" ]] || [[ -f "$git_dir/MERGE_HEAD" ]]; then
echo "❌ Git operation in progress. Complete or abort first."
return 1
fi
if ! git diff-index --quiet HEAD -- 2>/dev/null; then
echo "❌ You have uncommitted changes. Commit or stash them first:"
git status --porcelain
return 1
fi
if ! git remote get-url upstream >/dev/null 2>&1; then
echo "❌ No 'upstream' remote found"
return 1
fi
if ! git remote get-url origin >/dev/null 2>&1; then
echo "❌ No 'origin' remote found"
return 1
fi
local current_branch=$(git branch --show-current)
# Prevent pushing from main
if [[ "$current_branch" == "main" ]]; then
echo "❌ Cannot push from main branch. Switch to your feature branch first:"
echo " git checkout <your-feature-branch>"
return 1
fi
# Show what we're about to do
echo "⚠️ About to sync and push branch: $current_branch"
echo " This will:"
echo " • Fetch latest changes from upstream"
echo " • Rebase your branch on updated main"
echo " • Force-push to your fork (updates PR)"
echo ""
read -p "Continue? [y/N]: " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo "❌ Operation cancelled"
return 0
fi
echo "🔄 Final sync with upstream..."
if ! git fetch upstream; then
echo "❌ Failed to fetch from upstream"
return 1
fi
echo "📌 Updating local main..."
if ! git checkout main; then
echo "❌ Failed to checkout main"
return 1
fi
if ! git reset --hard upstream/main; then
echo "❌ Failed to reset main"
return 1
fi
if ! git push origin main; then
echo "❌ Failed to push main to origin"
return 1
fi
echo "🔀 Rebasing feature branch..."
if ! git checkout "$current_branch"; then
echo "❌ Failed to checkout $current_branch"
return 1
fi
if ! git rebase main; then
echo "❌ Rebase failed. Resolve conflicts and try again:"
echo " git add <resolved-files> && git rebase --continue"
echo " Then run 'gsp' again"
return 1
fi
echo "🚀 Pushing feature branch to fork..."
if ! git push origin "$current_branch" --force-with-lease; then
echo "❌ Failed to push to origin. The branch may have been updated."
echo " Run 'git pull origin $current_branch' and try again"
return 1
fi
echo "✅ Feature branch $current_branch successfully pushed to fork"
}
