utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 15:36:21 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #636 from spacewander/fix_rename_branch

Browse source 
use remote detected instead of 'origin' in rename-branch
This commit is contained in:
罗泽轩 2017-03-19 20:52:48 +08:00 committed by GitHub
parent 6e9da2a4e7 4a05ad29e4
commit 49771ba018
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/git-rename-branch
View file

@ -1,11 +1,17 @@
#!/usr/bin/env bash
set -e
# Assert there is at least one branch provided
test -z $1 && echo "new branch name required." 1>&2 && exit 1
new_branch="$1"
old_branch="${2-$(git symbolic-ref --short -q HEAD)}"
remote=$(git config branch."$old_branch".remote)
git branch -m "$old_branch" "$new_branch"
git push origin :"$old_branch"
git push --set-upstream origin "$new_branch"
# check if the branch is tracking a remote branch
if [[ -n "$remote" && "$remote" != "." ]]
then
git push "$remote" :"$old_branch"
git push --set-upstream "$remote" "$new_branch"
fi