verify-pack: check integrity in a saner order.

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 5956f06..f7b2b94 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
@@ -107,7 +107,7 @@ onto=$(git-rev-parse --verify "${onto_name}^0") || exit
 
 # Check if we are already based on $onto, but this should be
 # done only when upstream and onto are the same.
-if test "$upstream" = "onto"
+if test "$upstream" = "$onto"
 then
        mb=$(git-merge-base "$onto" "$branch")
        if test "$mb" = "$onto"