Merge branch 'master' into cc/trace

diff --git a/git-cherry.sh b/git-cherry.sh
index f0e8831fa49ae46eb7ad664b6ad489e3974c9f91..8832573fee9d3b8d4be92786ae5116ee6e5405bb 100755 (executable)
--- a/git-cherry.sh
+++ b/git-cherry.sh
@@ -51,9 +51,6 @@ patch=$tmp-patch
 mkdir $patch
 trap "rm -rf $tmp-*" 0 1 2 3 15
 
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
-
 for c in $inup
 do
        git-diff-tree -p $c