remote branch we found may not contain 'xxx/' if old branch is tracki…

…ng a local one
tj · Mar 16, 2017 · a41e2e8 · a41e2e8
1 parent a4af12a
commit a41e2e8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/bin/git-rename-branch b/bin/git-rename-branch
@@ -8,7 +8,8 @@ old_branch="${2-$(git symbolic-ref --short -q HEAD)}"
 remote="$(git for-each-ref --format='%(upstream:short)' "refs/heads/$old_branch")"
 
 git branch -m "$old_branch" "$new_branch"
-if [ -n "$remote" ]
+# check if the branch is tracking a remote branch
+if [[ -n "$remote" && "$remote" == */* ]]
 then
     remote=${remote%%/*}
     git push "$remote" :"$old_branch"