Merge branch 'maint-1.5.1' into maint

diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index e175b426a406b39f36ecd11c0ff96adb41b263be..d1bef9125bca0997e0e714b3f89e9c2df307d598 100644 (file)
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -587,7 +587,7 @@ if [ -z "$GIT_DIR" ]; then
        exit 1
 fi
 
-projectdesc=$(sed -e '1p' "$GIT_DIR/description")
+projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
 # Check if the description is unchanged from it's default, and shorten it to a
 # more manageable length if it is
 if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null