Fix gup's detection of branches containing slashes.

jasoncodes · May 1, 2012 · 0519fb2 · 0519fb2
1 parent 63cca2c
commit 0519fb2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/_posts/gup-git-rebase.markdown b/_posts/gup-git-rebase.markdown
@@ -34,7 +34,10 @@ function gup
     # fetch upstream changes
     git fetch
 
-    BRANCH=$(basename $(git symbolic-ref -q HEAD))
+    BRANCH=$(git symbolic-ref -q HEAD)
+    BRANCH=${BRANCH##refs/heads/}
+    BRANCH=${BRANCH:-HEAD}
+
     if [ -z "$(git config branch.$BRANCH.remote)" -o -z "$(git config branch.$BRANCH.merge)" ]
     then
       echo "\"$BRANCH\" is not a tracking branch." >&2