Re: [PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-07-15 Thread Junio C Hamano
Richard Hartmann richih.mailingl...@gmail.com writes:

 Verbatim copy of 4b8234b2693af634a77ea059331d1658e070f6d7 in original
 patch series from 2013-06-10.

As Jonathan said, this is not a commit log message.

I've applied up to 3/6 with fixups, but will stop here for now.


 Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com
 ---
  Documentation/githooks.txt |3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
 index b9003fe..1276730 100644
 --- a/Documentation/githooks.txt
 +++ b/Documentation/githooks.txt
 @@ -80,7 +80,8 @@ causes the 'git commit' to abort.
  
  The default 'pre-commit' hook, when enabled, catches introduction
  of lines with trailing whitespaces and aborts the commit when
 -such a line is found.
 +such a line is found. It will also prevent addition of non-ASCII
 +file names.
  
  All the 'git commit' hooks are invoked with the environment
  variable `GIT_EDITOR=:` if the command will not bring up an editor
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-07-14 Thread Richard Hartmann
Verbatim copy of 4b8234b2693af634a77ea059331d1658e070f6d7 in original
patch series from 2013-06-10.

Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com
---
 Documentation/githooks.txt |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b9003fe..1276730 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -80,7 +80,8 @@ causes the 'git commit' to abort.
 
 The default 'pre-commit' hook, when enabled, catches introduction
 of lines with trailing whitespaces and aborts the commit when
-such a line is found.
+such a line is found. It will also prevent addition of non-ASCII
+file names.
 
 All the 'git commit' hooks are invoked with the environment
 variable `GIT_EDITOR=:` if the command will not bring up an editor
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-07-14 Thread Jonathan Nieder
Richard Hartmann wrote:

 --- a/Documentation/githooks.txt
 +++ b/Documentation/githooks.txt
 @@ -80,7 +80,8 @@ causes the 'git commit' to abort.
  
  The default 'pre-commit' hook, when enabled, catches introduction
  of lines with trailing whitespaces and aborts the commit when
 -such a line is found.
 +such a line is found. It will also prevent addition of non-ASCII
 +file names.

The tenses are inconsistent here (catches versus will also).

It also seems odd to call the sample hooks default hooks, but that's
a wider problem and should probably be fixed by one commit all at once
(maybe imitating the wording of the prepare-commit-message
description).  Previously enabling them was a matter of a chmod +x
and the wording made more sense.

How about:

The default 'pre-commit' hook, when enabled, prevents introduction
of lines with trailing whitespace and prevents introduction of
files with non-ASCII filenames unless the hooks.allowNonAscii
configuration variable is true.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-06-10 Thread Richard Hartmann
Signed-off-by: Richard Hartmann richih.mailingl...@gmail.com
---
 Documentation/githooks.txt |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b9003fe..1276730 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -80,7 +80,8 @@ causes the 'git commit' to abort.
 
 The default 'pre-commit' hook, when enabled, catches introduction
 of lines with trailing whitespaces and aborts the commit when
-such a line is found.
+such a line is found. It will also prevent addition of non-ASCII
+file names.
 
 All the 'git commit' hooks are invoked with the environment
 variable `GIT_EDITOR=:` if the command will not bring up an editor
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html