threads / patch / 26390

patchpost-receive-email: suppress error if description file missing

Subject: [PATCH] post-receive-email: suppress error if description file missing

## tl;dr

3 messages between Feb 2, 2011 and Feb 3, 2011. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Sitaram Chamarty· Feb 2, 2011, 17:42 UTC · lore
---
 contrib/hooks/post-receive-email |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/hooks/post-receive-email +1 −1
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index f99ea95..71f2b47 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -709,7 +709,7 @@ if [ -z "$GIT_DIR" ]; then
 	exit 1
 fi
 
-projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
+projectdesc=$(sed -ne '1p' "$GIT_DIR/description 2>/dev/null")
 # 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
-- 
1.7.3.4
Junio C Hamano· Feb 2, 2011, 18:36 UTC · re: Sitaram Chamarty · lore

Re: [PATCH] post-receive-email: suppress error if description file missing

Sitaram Chamarty <sitaramc@gmail.com> writes:
Show 14 quoted lines
> ---
>  contrib/hooks/post-receive-email |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
> index f99ea95..71f2b47 100755
> --- a/contrib/hooks/post-receive-email
> +++ b/contrib/hooks/post-receive-email
> @@ -709,7 +709,7 @@ if [ -z "$GIT_DIR" ]; then
>  	exit 1
>  fi
>  
> -projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
> +projectdesc=$(sed -ne '1p' "$GIT_DIR/description 2>/dev/null")

I suspect that you would want to have the redirection outside the dq pair, but other than that, well spotted.

You forgot to sign-off, though ;-)
Show 5 quoted lines
>  # 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
> -- 
> 1.7.3.4
Sitaram Chamarty· Feb 3, 2011, 01:00 UTC · re: Junio C Hamano · lore

Re: [PATCH] post-receive-email: suppress error if description file missing

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
---
On Wed, Feb 02, 2011 at 10:36:43AM -0800, Junio C Hamano wrote:
> I suspect that you would want to have the redirection outside the dq pair,
> but other than that, well spotted.

doh! Thanks for catching the stupid error -- I shouldn't attempt even a simple patch when half-asleep I guess :)

> You forgot to sign-off, though ;-)
done!
 contrib/hooks/post-receive-email |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/hooks/post-receive-email +1 −1
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index f99ea95..21989fc 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -709,7 +709,7 @@ if [ -z "$GIT_DIR" ]; then
 	exit 1
 fi
 
-projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
+projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null)
 # 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
-- 
1.7.3.4

← back to recent threads