Merge branch 'master'

diff --git a/templates/hooks--update b/templates/hooks--update
index 0726975367de1bff2d4575537f89f52ff87fa1a7..3f38b82a4710400e512d478ec6b552202a34369f 100644 (file)
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -16,10 +16,14 @@ then
        git-rev-list --pretty "$3"
 else
        $base=$(git-merge-base "$2" "$3")
-       if [ $base == "$2" ]; then
+       case "$base" in
+       "$2")
                echo "New commits:"
-       else
+               ;;
+       *)
                echo "Rebased ref, commits from common ancestor:"
+               ;;
+       esac
 fi
 git-rev-list --pretty "$3" "^$base"
 fi |