Re: [PATCH] hooks--update: fix test for properly set up project description file
From: Andreas Ericsson <hidden>
Date: 2016-06-15 22:43:47
Gerrit Pape wrote:
quoted hunk ↗ jump to hunk
The update hook template intends to abort if the project description file hasn't been adjusted or is empty. This patch fixes the check for 'being adjusted'. Signed-off-by: Gerrit Pape <redacted> --- templates/hooks--update | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff --git a/templates/hooks--update b/templates/hooks--update index d8c7626..65e8c32 100644 --- a/templates/hooks--update +++ b/templates/hooks--update@@ -34,8 +34,8 @@ fi allowunannotated=$(git-repo-config --bool hooks.allowunannotated) # check for no description -projectdesc=$(sed -e '1p' "$GIT_DIR/description") -if [ -z "$projectdesc" -o "$projectdesc" = "Unnamed repository; edit this file to name it for gitweb" ]; then +projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
Write this as projectdesc=$(sed -e 1q "$GIT_DIR/description") instead. It's a little shorter, a little faster and slightly more portable.
+if [ -z "$projectdesc" -o "$projectdesc" = "Unnamed repository; edit this file to name it for gitweb." ]; then echo "*** Project description file hasn't been set" >&2 exit 1
I must have missed when the default updatehook got this addendum, as it's impossible to push to a repository that isn't named with this hook in effect. I imagine this could lead to some fun problems when trying to push to repositories on windows machines. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231