Merge branch 'master' into lt/logopt

diff --git a/git-rebase.sh b/git-rebase.sh
index 211bf6896844ddf2cc903c4c8fcf0f021c3d8131..86dfe9cb96aea2f52ea6dea51d89605530abfd08 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -75,7 +75,7 @@ esac
 # The upstream head must be given.  Make sure it is valid.
 upstream_name="$1"
 upstream=`git rev-parse --verify "${upstream_name}^0"` ||
-    die "invalid upsteram $upstream_name"
+    die "invalid upstream $upstream_name"
 
 # If a hook exists, give it a chance to interrupt
 if test -x "$GIT_DIR/hooks/pre-rebase"
@@ -94,7 +94,7 @@ case "$#" in
        ;;
 *)
        branch_name=`git symbolic-ref HEAD` || die "No current branch"
-       branch_name=`expr "$branch_name" : 'refs/heads/\(.*\)'`
+       branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'`
        ;;
 esac
 branch=$(git-rev-parse --verify "${branch_name}^0") || exit