emileclarkb/fork-g
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve fetch/prune behavior

Browse source
This commit is contained in:
Will Hilton 2016-11-16 17:42:43 -05:00
parent 02bad2f3ba
commit 3650830ab8
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
bin/g
View file

@ -196,13 +196,20 @@ fi
# else # else
git branch -d "$2" git branch -d "$2"
if [[ "$?" -ne 0 ]]; then if [[ "$?" -ne 0 ]]; then
if confirm 'Are sure you want to delete this branch?'; then if confirm 'This branch hasn'"'"'t been merged. Are sure you want to delete this branch?'; then
echo '' echo ''
git branch -D "$2" git branch -D "$2"
else else
echo '' echo ''
fi fi
fi fi
if confirm 'Would you like to delete this branch on the remote as well?'; then
echo ''
git push origin --delete "$2"
else
echo ''
echo 'OK, just thought I'"'"'d ask.'
fi
;; ;;
branches) branches)
@ -241,9 +248,19 @@ for local_branch in $branches; do
remote_branch=$(git config --get branch.$local_branch.merge | sed 's:refs/heads/::') remote_branch=$(git config --get branch.$local_branch.merge | sed 's:refs/heads/::')
# Git throws an error if we try the fetch command on the current branch. Sheesh # Git throws an error if we try the fetch command on the current branch. Sheesh
if [ "$current_branch" = "$local_branch" ]; then if [ "$current_branch" = "$local_branch" ]; then
git merge --ff-only $remote/$remote_branch git merge --ff-only "$remote/$remote_branch"
else else
git fetch $remote $remote_branch:$local_branch if git fetch $remote $remote_branch:$local_branch; then
echo "fetched $local_branch <- $remote/$remote_branch"
# Detect and delete branches not on remote
else
if confirm "Failed to fast forward local branch '$local_branch'. Do you want to delete the local branch if it's merged?"; then
echo ''
git branch -d "$local_branch"
else
echo ''
fi
fi
fi fi
done done
;; ;;