# [PATCH] hooks--update: fix test for properly set up project description file 4 messages from 2007-11-06 to 2007-11-08. Participants: Gerrit Pape, Andreas Ericsson, Junio C Hamano. Thread: https://gitlist.dev/t/10681 ## Gerrit Pape, 2007-11-06 13:47 Subject: [PATCH] hooks--update: fix test for properly set up project description file Message-ID: <20071106134749.24233.qmail@809f27f669039a.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20071106134749.24233.qmail%40809f27f669039a.315fe32.mid.smarden.org ``` 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 --- 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") +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 fi -- 1.5.3.5 ``` ## Andreas Ericsson, 2007-11-06 13:55 Subject: Re: [PATCH] hooks--update: fix test for properly set up project description file Message-ID: <4730726B.1000407@op5.se> URL: https://gitlist.dev/e/4730726B.1000407%40op5.se In-Reply-To: <20071106134749.24233.qmail@809f27f669039a.315fe32.mid.smarden.org> ``` Gerrit Pape wrote: > 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 > --- > 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 ``` ## Gerrit Pape, 2007-11-08 14:02 Subject: [PATCH] hooks--update: fix test for properly set up project description file Message-ID: <20071108140200.24902.qmail@f23d7e396b1523.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20071108140200.24902.qmail%40f23d7e396b1523.315fe32.mid.smarden.org In-Reply-To: <4730726B.1000407@op5.se> ``` 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 --- On Tue, Nov 06, 2007 at 02:55:55PM +0100, Andreas Ericsson wrote: > Gerrit Pape wrote: > > # 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. I made it $(head -n 1 ...). templates/hooks--update | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/hooks--update b/templates/hooks--update index d8c7626..fbf664f 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=$(head -n 1 "$GIT_DIR/description") +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 fi -- 1.5.3.5 ``` ## Junio C Hamano, 2007-11-08 22:13 Subject: Re: [PATCH] hooks--update: fix test for properly set up project description file Message-ID: <7v640c1j3h.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v640c1j3h.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20071108140200.24902.qmail@f23d7e396b1523.315fe32.mid.smarden.org> ``` Gerrit Pape writes: > 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 > --- > > On Tue, Nov 06, 2007 at 02:55:55PM +0100, Andreas Ericsson wrote: >> Gerrit Pape wrote: >> > # 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. I even suspect that the original 'p' is indeed a typo of 'q'. ```