From cc0dff2f49cfbd786eca498fe2532de0455e1759 Mon Sep 17 00:00:00 2001 From: spacewander Date: Tue, 7 Mar 2017 14:39:50 +0800 Subject: [PATCH] fix syntax & name variables better in rename-branch --- bin/git-rename-branch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bin/git-rename-branch b/bin/git-rename-branch index 8201aa8..0ea2a66 100755 --- a/bin/git-rename-branch +++ b/bin/git-rename-branch @@ -3,11 +3,9 @@ # Assert there is at least one branch provided test -z $1 && echo "new branch name required." 1>&2 && exit 1 -if [ -z $2 ] - then - $2=${git symbolic-ref --short -q HEAD} -fi +new_branch="$1" +old_branch="${2-$(git symbolic-ref --short -q HEAD)}" -git branch -m $2 $1 -git push origin :$2 -git push --set-upstream origin $1 +git branch -m "$old_branch" "$new_branch" +git push origin :"$old_branch" +git push --set-upstream origin "$new_branch"