{"thread":{"id":"10681","subject":"[PATCH] hooks--update: fix test for properly set up project description file","startedAt":"2007-11-06T13:47:49Z","lastAt":"2007-11-08T22:13:38Z","messageCount":4,"participants":["Gerrit Pape","Andreas Ericsson","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"58540","messageId":"20071106134749.24233.qmail@809f27f669039a.315fe32.mid.smarden.org","threadId":"10681","inReplyTo":null,"subject":"[PATCH] hooks--update: fix test for properly set up project description file","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2007-11-06T13:47:49Z","receivedAt":"2007-11-06T13:47:49Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"The update hook template intends to abort if the project description file\nhasn't been adjusted or is empty.  This patch fixes the check for 'being\nadjusted'.\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n templates/hooks--update |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/templates/hooks--update b/templates/hooks--update\nindex d8c7626..65e8c32 100644\n--- a/templates/hooks--update\n+++ b/templates/hooks--update\n@@ -34,8 +34,8 @@ fi\n allowunannotated=$(git-repo-config --bool hooks.allowunannotated)\n \n # check for no description\n-projectdesc=$(sed -e '1p' \"$GIT_DIR/description\")\n-if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit this file to name it for gitweb\" ]; then\n+projectdesc=$(sed -ne '1p' \"$GIT_DIR/description\")\n+if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit this file to name it for gitweb.\" ]; then\n \techo \"*** Project description file hasn't been set\" >&2\n \texit 1\n fi\n-- \n1.5.3.5\n"},{"id":"58544","messageId":"4730726B.1000407@op5.se","threadId":"10681","inReplyTo":"20071106134749.24233.qmail@809f27f669039a.315fe32.mid.smarden.org","subject":"Re: [PATCH] hooks--update: fix test for properly set up project description file","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2007-11-06T13:55:55Z","receivedAt":"2007-11-06T13:55:55Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Gerrit Pape wrote:\n> The update hook template intends to abort if the project description file\n> hasn't been adjusted or is empty.  This patch fixes the check for 'being\n> adjusted'.\n> \n> Signed-off-by: Gerrit Pape <pape@smarden.org>\n> ---\n>  templates/hooks--update |    4 ++--\n>  1 files changed, 2 insertions(+), 2 deletions(-)\n> \n> diff --git a/templates/hooks--update b/templates/hooks--update\n> index d8c7626..65e8c32 100644\n> --- a/templates/hooks--update\n> +++ b/templates/hooks--update\n> @@ -34,8 +34,8 @@ fi\n>  allowunannotated=$(git-repo-config --bool hooks.allowunannotated)\n>  \n>  # check for no description\n> -projectdesc=$(sed -e '1p' \"$GIT_DIR/description\")\n> -if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit this file to name it for gitweb\" ]; then\n> +projectdesc=$(sed -ne '1p' \"$GIT_DIR/description\")\n\nWrite this as \n\n\tprojectdesc=$(sed -e 1q \"$GIT_DIR/description\")\n\ninstead. It's a little shorter, a little faster and slightly more portable.\n\n> +if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit this file to name it for gitweb.\" ]; then\n>  \techo \"*** Project description file hasn't been set\" >&2\n>  \texit 1\n\nI must have missed when the default updatehook got this addendum, as it's\nimpossible to push to a repository that isn't named with this hook in\neffect. I imagine this could lead to some fun problems when trying to\npush to repositories on windows machines.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"58887","messageId":"20071108140200.24902.qmail@f23d7e396b1523.315fe32.mid.smarden.org","threadId":"10681","inReplyTo":"4730726B.1000407@op5.se","subject":"[PATCH] hooks--update: fix test for properly set up project description file","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2007-11-08T14:02:00Z","receivedAt":"2007-11-08T14:02:00Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"The update hook template intends to abort if the project description file\nhasn't been adjusted or is empty.  This patch fixes the check for 'being\nadjusted'.\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n\nOn Tue, Nov 06, 2007 at 02:55:55PM +0100, Andreas Ericsson wrote:\n> Gerrit Pape wrote:\n> > # check for no description\n> >-projectdesc=$(sed -e '1p' \"$GIT_DIR/description\")\n> >-if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit\n> >this\n> >file to name it for gitweb\" ]; then\n> >+projectdesc=$(sed -ne '1p' \"$GIT_DIR/description\")\n>\n> Write this as\n>       projectdesc=$(sed -e 1q \"$GIT_DIR/description\")\n> instead. It's a little shorter, a little faster and slightly more\n> portable.\n\nI made it $(head -n 1 ...).\n\n\n templates/hooks--update |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/templates/hooks--update b/templates/hooks--update\nindex d8c7626..fbf664f 100644\n--- a/templates/hooks--update\n+++ b/templates/hooks--update\n@@ -34,8 +34,8 @@ fi\n allowunannotated=$(git-repo-config --bool hooks.allowunannotated)\n \n # check for no description\n-projectdesc=$(sed -e '1p' \"$GIT_DIR/description\")\n-if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit this file to name it for gitweb\" ]; then\n+projectdesc=$(head -n 1 \"$GIT_DIR/description\")\n+if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit this file to name it for gitweb.\" ]; then\n \techo \"*** Project description file hasn't been set\" >&2\n \texit 1\n fi\n-- \n1.5.3.5\n"},{"id":"58945","messageId":"7v640c1j3h.fsf@gitster.siamese.dyndns.org","threadId":"10681","inReplyTo":"20071108140200.24902.qmail@f23d7e396b1523.315fe32.mid.smarden.org","subject":"Re: [PATCH] hooks--update: fix test for properly set up project description file","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-08T22:13:38Z","receivedAt":"2007-11-08T22:13:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Gerrit Pape <pape@smarden.org> writes:\n\n> The update hook template intends to abort if the project description file\n> hasn't been adjusted or is empty.  This patch fixes the check for 'being\n> adjusted'.\n>\n> Signed-off-by: Gerrit Pape <pape@smarden.org>\n> ---\n>\n> On Tue, Nov 06, 2007 at 02:55:55PM +0100, Andreas Ericsson wrote:\n>> Gerrit Pape wrote:\n>> > # check for no description\n>> >-projectdesc=$(sed -e '1p' \"$GIT_DIR/description\")\n>> >-if [ -z \"$projectdesc\" -o \"$projectdesc\" = \"Unnamed repository; edit\n>> >this\n>> >file to name it for gitweb\" ]; then\n>> >+projectdesc=$(sed -ne '1p' \"$GIT_DIR/description\")\n>>\n>> Write this as\n>>       projectdesc=$(sed -e 1q \"$GIT_DIR/description\")\n>> instead. It's a little shorter, a little faster and slightly more\n>> portable.\n\nI even suspect that the original 'p' is indeed a typo of 'q'.\n"}]}