Merge pull request #71 from unixorn/update-cut-branch

Update cut branch

Author: unixorn

bin/git-cut-branch

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #
 # https://github.com/rtomayko/dotfiles
 #
@@ -37,7 +37,7 @@ sha=$(git rev-parse HEAD)
 die "you're not on a branch"
 
 # just the branch name please
-current=$(echo "$ref" |sed 's@^refs/heads/@@')
+current=$(echo "$ref" | sed 's@^refs/heads/@@')
 [ -n "$current" ] ||
 die "you're in a weird place; get on a local branch"
 
@@ -47,11 +47,12 @@ merge=$(git config --get "branch.$current.merge" | sed 's@refs/heads/@@')
 
 # build up a sane <remote>/<branch> name
 # shellcheck disable=SC2166
-if [ -n "$remote" -a -n "$merge" ]
-then tracking="$remote/$merge"
-elif [ -n "$merge" ]
-then tracking="$merge"
-else die "$current is not tracking anything"
+if [ -n "$remote" -a -n "$merge" ]; then
+  tracking="$remote/$merge"
+elif [ -n "$merge" ]; then
+  tracking="$merge"
+else
+  die "$current is not tracking anything"
 fi
 
 # make sure there's no changes before we reset hard
@@ -64,7 +65,7 @@ fi
 git branch "$branch"
 git reset -q --hard "$tracking"
 git checkout -q "$branch"
-git branch --set-upstream "$branch" "$tracking"
+git branch --set-upstream-to "$branch" "$tracking"
 git reset -q --hard "$sha"
 # shellcheck disable=SC2086,SC2046
 echo "[$(shortsha "$sha")...$(shortsha $(git rev-parse $tracking))] $current"