Merge branch 'maint'

diff --git a/git-cherry.sh b/git-cherry.sh
index 1a6232013b471d9a3df6ab10705c263aa740c2f7..f0e8831fa49ae46eb7ad664b6ad489e3974c9f91 100755 (executable)
--- a/git-cherry.sh
+++ b/git-cherry.sh
@@ -20,7 +20,7 @@ case "$1" in -v) verbose=t; shift ;; esac
 
 case "$#,$1" in
 1,*..*)
-    upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
+    upstream=$(expr "z$1" : 'z\(.*\)\.\.') ours=$(expr "z$1" : '.*\.\.\(.*\)$')
     set x "$upstream" "$ours"
     shift ;;
 esac