Hi,
I sent this patch but didn't receive any feedback. Is it a bad idea?
It may be better if 'git-commit' didn't call this hook when recording a merge,
but I don't write C very much.
Thanks.
> When recording a merge, even if there are problematic whitespace errors,
> let them pass, because the damage has already been done in the history. If
> this hook triggers, it will invite a novice to fix such errors in a merge
> commit but such a change is not related to the merge. Don't encourage it.
>
> Signed-off-by: Nanako Shiraishi <nanako3@xxxxxxxxxxx>
> ---
> templates/hooks--pre-commit.sample | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample
> index 439eefd..66e56bb 100755
> --- a/templates/hooks--pre-commit.sample
> +++ b/templates/hooks--pre-commit.sample
> @@ -7,6 +7,11 @@
> #
> # To enable this hook, rename this file to "pre-commit".
>
> +if test -f "${GIT_DIR-.git}"/MERGE_HEAD
> +then
> + exit 0
> +fi
> +
> if git-rev-parse --verify HEAD >/dev/null 2>&1
> then
> against=HEAD
> --
> 1.6.6
>
> --
> Nanako Shiraishi
> http://ivory.ap.teacup.com/nanako3/
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html