threads / patch / 28444

patchcontrib/hooks: adapt default Debian install location for contrib hooks

Subject: [PATCH] contrib/hooks: adapt default Debian install location for contrib hooks

## tl;dr

4 messages between Sep 20, 2011 and Sep 26, 2011. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Gerrit Pape· Sep 20, 2011, 11:19 UTC · lore

Placing the contrib hooks into /usr/share/doc/ wasn't a good idea in the first place. According to the Debian policy they should be located in /usr/share/git-core/, so let's put them there.

Thanks to Bill Allombert for reporting this through
 http://bugs.debian.org/640949

Signed-off-by: Gerrit Pape <pape@smarden.org>
---
 contrib/hooks/post-receive-email     |    4 ++--
 templates/hooks--post-receive.sample |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Show changes to 2 files +3 −3

contrib/hooks/post-receive-email, templates/hooks--post-receive.sample

diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index fa6d41a..ba077c1 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -11,11 +11,11 @@
 # will have put this somewhere standard.  You should make this script
 # executable then link to it in the repository you would like to use it in.
 # For example, on debian the hook is stored in
-# /usr/share/doc/git-core/contrib/hooks/post-receive-email:
+# /usr/share/git-core/contrib/hooks/post-receive-email:
 #
 #  chmod a+x post-receive-email
 #  cd /path/to/your/repository.git
-#  ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
+#  ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive
 #
 # This hook script assumes it is enabled on the central repository of a
 # project, with all users pushing only to it and not between each other.  It
diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample
index 7a83e17..e48346e 100755
--- a/templates/hooks--post-receive.sample
+++ b/templates/hooks--post-receive.sample
@@ -12,4 +12,4 @@
 # see contrib/hooks/ for a sample, or uncomment the next line and
 # rename the file to "post-receive".
 
-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
+#. /usr/share/git-core/contrib/hooks/post-receive-email

-- 
1.7.5.4

Drew Northup· Sep 20, 2011, 19:38 UTC · re: Gerrit Pape · lore

Re: [PATCH] contrib/hooks: adapt default Debian install location for contrib hooks

On Tue, 2011-09-20 at 11:19 +0000, Gerrit Pape wrote:

Show 12 quoted lines

> Placing the contrib hooks into /usr/share/doc/ wasn't a good idea in the
> first place.  According to the Debian policy they should be located in
> /usr/share/git-core/, so let's put them there.
> 
> Thanks to Bill Allombert for reporting this through
>  http://bugs.debian.org/640949
> 
> Signed-off-by: Gerrit Pape <pape@smarden.org>
> ---
>  contrib/hooks/post-receive-email     |    4 ++--
>  templates/hooks--post-receive.sample |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

What is the rationale for applying this outside of the land of Debian? I understand the EPEL/Fedora crew are putting those example hooks into /usr/share/git-gore, but I want to know why that should become the standard in git.git.

-- 
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59

Junio C Hamano· Sep 20, 2011, 19:44 UTC · re: Gerrit Pape · lore

Re: [PATCH] contrib/hooks: adapt default Debian install location for contrib hooks

Gerrit Pape <pape@smarden.org> writes:

Show 15 quoted lines

> diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
> index fa6d41a..ba077c1 100755
> --- a/contrib/hooks/post-receive-email
> +++ b/contrib/hooks/post-receive-email
> @@ -11,11 +11,11 @@
>  # will have put this somewhere standard.  You should make this script
>  # executable then link to it in the repository you would like to use it in.
>  # For example, on debian the hook is stored in
> -# /usr/share/doc/git-core/contrib/hooks/post-receive-email:
> +# /usr/share/git-core/contrib/hooks/post-receive-email:
>  #
>  #  chmod a+x post-receive-email
>  #  cd /path/to/your/repository.git
> -#  ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
> +#  ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive

This one I do not have any problem with; the leading text makes it very clear that this is an example that is specific to Debian and that is good enough to signal readers that they may have to look elsewhere if they are on a different distribution.

Show 10 quoted lines

> diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample
> index 7a83e17..e48346e 100755
> --- a/templates/hooks--post-receive.sample
> +++ b/templates/hooks--post-receive.sample
> @@ -12,4 +12,4 @@
>  # see contrib/hooks/ for a sample, or uncomment the next line and
>  # rename the file to "post-receive".
>  
> -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
> +#. /usr/share/git-core/contrib/hooks/post-receive-email

I am however not sure about this. For one thing, it is not clear that this (both old and new) text are meant to be Debian specific, and they should not complain and instead should look for it elsewhere, if the users do not find the sample in the path that is shown in the file. For another, it is not "see ... for a sample, OR UNCOMMENT" at all, for readers who are _NOT_ interested in sending e-mails from the hook at all, but the way it is stated makes it sound as if people who do not want to bother reading the samples can blindly enable the hook and it is guaranteed that the particular sample hook satisfies their needs, which is not the case.

Perhaps removing this sample file might be a better option. The first ten lines or so repeat what the documentation says, which can go stale, and if we remove them, the only thing that remains is the "see contrib/hooks for a sample".

Thanks.

Gerrit Pape· Sep 26, 2011, 12:58 UTC · re: Junio C Hamano · lore

[PATCH 1/2] contrib/hooks: adapt comment about Debian install location for contrib hooks

Placing the contrib hooks into /usr/share/doc/ wasn't a good idea in the first place. According to the Debian policy they should be located in /usr/share/git-core/, so let's put them there.

Thanks to Bill Allombert for reporting this through
 http://bugs.debian.org/640949

Signed-off-by: Gerrit Pape <pape@smarden.org>
---

On Tue, Sep 20, 2011 at 12:44:18PM -0700, Junio C Hamano wrote:

Show 25 quoted lines

> > --- a/contrib/hooks/post-receive-email
> > +++ b/contrib/hooks/post-receive-email
> > @@ -11,11 +11,11 @@
> >  # will have put this somewhere standard.  You should make this
> >  script
> >  # executable then link to it in the repository you would like to
> >  use it in.
> >  # For example, on debian the hook is stored in
> > -# /usr/share/doc/git-core/contrib/hooks/post-receive-email:
> > +# /usr/share/git-core/contrib/hooks/post-receive-email:
> >  #
> >  #  chmod a+x post-receive-email
> >  #  cd /path/to/your/repository.git
> > -#  ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email
> > hooks/post-receive
> > +#  ln -sf /usr/share/git-core/contrib/hooks/post-receive-email
> > hooks/post-receive
>
> This one I do not have any problem with; the leading text makes it
> very
> clear that this is an example that is specific to Debian and that is
> good enough to signal readers that they may have to look elsewhere if
> they
> are on a different distribution.
>

Ok, thanks.  I stripped this patch to just touch this file.

Regards, Gerrit.

 contrib/hooks/post-receive-email |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to contrib/hooks/post-receive-email +2 −2

diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index fa6d41a..ba077c1 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -11,11 +11,11 @@
 # will have put this somewhere standard.  You should make this script
 # executable then link to it in the repository you would like to use it in.
 # For example, on debian the hook is stored in
-# /usr/share/doc/git-core/contrib/hooks/post-receive-email:
+# /usr/share/git-core/contrib/hooks/post-receive-email:
 #
 #  chmod a+x post-receive-email
 #  cd /path/to/your/repository.git
-#  ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive
+#  ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive
 #
 # This hook script assumes it is enabled on the central repository of a
 # project, with all users pushing only to it and not between each other.  It

-- 
1.7.6.3