Merge branch 'master' into lt/logopt

diff --git a/git-rebase.sh b/git-rebase.sh
index 5956f0654e1b344db7893519e309a45aa22ae16f..86dfe9cb96aea2f52ea6dea51d89605530abfd08 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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