summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-27 00:08:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-27 00:08:00 (GMT)
commit69bcc43eca0f251617e3b5db5df632b24db94e92 (patch)
treed816d41d36c73f3e665e4a2967a59abef4ce12d3 /git-rebase.sh
parent3496277a561307c3d31d2085347af8eb4c667c36 (diff)
parent5981e09999e90b389a02843671529a0faaf72143 (diff)
downloadgit-69bcc43eca0f251617e3b5db5df632b24db94e92.zip
git-69bcc43eca0f251617e3b5db5df632b24db94e92.tar.gz
git-69bcc43eca0f251617e3b5db5df632b24db94e92.tar.bz2
Merge branch 'fix'
* fix: commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 86dfe9c..f7b2b94 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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"