From 4a05ad29e4bf31d33ada793750fb4712a3167aa7 Mon Sep 17 00:00:00 2001 From: spacewander Date: Sun, 19 Mar 2017 01:56:33 +0800 Subject: [PATCH] git-rename-branch: use detected upstream remote --- bin/git-rename-branch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/git-rename-branch b/bin/git-rename-branch index 0ea2a66..b0a0769 100755 --- a/bin/git-rename-branch +++ b/bin/git-rename-branch @@ -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