From: Michal Nazarewicz <mina86@mina86.com>
To: martin rudalics <rudalics@gmx.at>,
Noam Postavsky <npostavs@users.sourceforge.net>
Cc: Paul Eggert <eggert@cs.ucla.edu>, emacs-devel <emacs-devel@gnu.org>
Subject: Re: master has switched from Automake to GNU Make
Date: Tue, 11 Apr 2017 18:21:01 +0200 [thread overview]
Message-ID: <xa1tpogihq4y.fsf@mina86.com> (raw)
In-Reply-To: <58ECE005.7050301@gmx.at>
On Tue, Apr 11 2017, martin rudalics wrote:
> > If you merge that commit or any child of it *with*
> > conflicts (the conflicts can be unrelated) then the whitespace check
> > is triggered when you commit the resolution.
>
> I have definitively encountered this case before too.
>
> > Furthermore, I believe the whitespace check is only installed if you
> > run './autogen git' or './autogen all'. If you just plain './autogen'
> > then the git hooks are not installed.
>
> I always run './autogen.sh' because IIRC that is (or at least was) the
> recommended way.
>
> > I guess most people are rebasing instead of merging or didn't install
> > the git hooks and hence don't see this kind of failure.
>
> I never rebase. Whether and how I installed the hooks is beyond my
> knowledge. But IIUC Michael who committed the changes in
> SpecialCasing.txt did not install the hook.
$ ll .git/hooks/
total 16
-rwx------ 1 mpn eng 452 Dec 3 2014 applypatch-msg*
-rwx------ 1 mpn eng 4002 Jan 28 2016 commit-msg*
-rwx------ 1 mpn eng 398 Dec 3 2014 pre-applypatch*
-rwx------ 1 mpn eng 1419 Jul 27 2016 pre-commit*
$ grep -ve ^# -e ^\$ .git/hooks/pre-commit
LC_ALL=C
export LC_ALL
exec >&2
. git-sh-setup
git_diff='git diff --cached --name-only --diff-filter=A'
ok_chars='\0+[=-=]./0-9A-Z_a-z'
nbadchars=`$git_diff -z HEAD | tr -d "$ok_chars" | wc -c`
if test "$nbadchars" -ne 0; then
echo "File name does not consist of -+./_ or ASCII letters or digits."
exit 1
fi
for new_name in `$git_diff HEAD`; do
case $new_name in
-* | */-*)
echo "$new_name: File name component begins with '-'."
exit 1;;
ChangeLog | */ChangeLog)
echo "$new_name: Please use git commit messages, not ChangeLog files."
exit 1;;
esac
done
$ grep -ve ^# -e ^\$ .git/hooks/pre-applypatch
. git-sh-setup
test -x "$GIT_DIR/hooks/pre-commit" &&
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
:
I cannot confirm that those were there when I was pushing
SpecialCasing.txt but my guess would be yes.
--
Best regards
ミハウ “𝓶𝓲𝓷𝓪86” ナザレヴイツ
«If at first you don’t succeed, give up skydiving»
next prev parent reply other threads:[~2017-04-11 16:21 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 8:33 No rule to make target `../../build-aux/snippet/arg-nonnull.h' martin rudalics
2017-03-17 9:16 ` Eli Zaretskii
2017-03-17 9:39 ` martin rudalics
2017-03-17 10:00 ` Paul Eggert
2017-03-17 10:37 ` martin rudalics
2017-03-17 15:55 ` Paul Eggert
2017-03-17 18:01 ` martin rudalics
2017-03-17 18:58 ` master has switched from Automake to GNU Make Paul Eggert
2017-03-17 19:26 ` Eli Zaretskii
2017-03-17 19:33 ` Paul Eggert
2017-03-17 19:51 ` Eli Zaretskii
2017-03-17 20:21 ` Kaushal Modi
2017-03-17 21:45 ` Paul Eggert
2017-03-17 21:33 ` Paul Eggert
2017-03-18 8:01 ` Eli Zaretskii
2017-03-18 16:26 ` Paul Eggert
2017-03-18 16:47 ` Eli Zaretskii
2017-03-18 8:11 ` martin rudalics
2017-03-18 9:28 ` Eli Zaretskii
2017-03-18 10:33 ` martin rudalics
2017-03-20 11:26 ` Robert Marshall
2017-03-20 15:59 ` Paul Eggert
2017-03-21 8:31 ` Robert Marshall
2017-03-21 17:42 ` Tom Tromey
2017-03-21 18:23 ` Paul Eggert
2017-03-21 19:01 ` Eli Zaretskii
2017-03-23 8:02 ` martin rudalics
2017-03-23 11:41 ` Stefan Monnier
2017-03-23 13:06 ` martin rudalics
2017-03-23 15:44 ` Stefan Monnier
2017-03-24 9:03 ` martin rudalics
2017-03-24 12:04 ` Stefan Monnier
2017-03-24 13:25 ` martin rudalics
2017-03-24 13:42 ` Stefan Monnier
2017-03-24 13:42 ` Lars Brinkhoff
2017-03-24 18:53 ` martin rudalics
2017-03-24 23:35 ` Stephen Leake
2017-03-25 9:28 ` martin rudalics
2017-03-26 12:58 ` Stephen Leake
2017-03-26 14:31 ` Eli Zaretskii
2017-03-24 14:16 ` Filipp Gunbin
2017-03-24 18:53 ` martin rudalics
2017-03-24 23:27 ` Stephen Leake
2017-03-24 23:40 ` Stefan Monnier
2017-03-25 9:14 ` Andreas Schwab
2017-03-25 17:36 ` Stefan Monnier
2017-03-25 17:57 ` Elias Mårtenson
2017-03-25 9:28 ` martin rudalics
2017-03-25 9:26 ` martin rudalics
2017-03-25 15:24 ` Paul Eggert
2017-03-25 15:55 ` Eli Zaretskii
2017-03-26 8:39 ` martin rudalics
2017-03-26 14:18 ` Eli Zaretskii
2017-03-26 19:01 ` martin rudalics
2017-03-26 19:16 ` Eli Zaretskii
2017-03-26 19:33 ` martin rudalics
2017-03-27 14:53 ` Eli Zaretskii
2017-03-27 19:29 ` martin rudalics
2017-03-27 19:33 ` Eli Zaretskii
2017-03-26 8:38 ` martin rudalics
2017-03-26 13:03 ` Stephen Leake
2017-03-26 14:31 ` Eli Zaretskii
2017-04-11 10:55 ` martin rudalics
2017-04-11 12:13 ` Andreas Schwab
2017-04-11 13:17 ` Yuri Khan
2017-04-11 13:53 ` martin rudalics
2017-04-11 14:07 ` Eli Zaretskii
2017-04-11 15:13 ` Yuri Khan
2017-04-11 15:31 ` Sven Axelsson
2017-04-12 9:30 ` martin rudalics
2017-04-12 9:30 ` martin rudalics
2017-04-11 18:19 ` Sven Joachim
2017-04-11 13:23 ` martin rudalics
2017-04-11 15:45 ` Andreas Schwab
2017-04-11 18:00 ` martin rudalics
2017-04-11 18:06 ` martin rudalics
2017-04-11 13:34 ` Noam Postavsky
2017-04-11 13:54 ` martin rudalics
2017-04-11 14:09 ` Noam Postavsky
2017-04-12 9:28 ` martin rudalics
2017-04-12 12:18 ` Michal Nazarewicz
2017-04-12 14:42 ` Thien-Thi Nguyen
2017-04-12 14:38 ` Paul Eggert
2017-04-11 16:21 ` Michal Nazarewicz [this message]
2017-04-11 16:24 ` Noam Postavsky
2017-04-12 12:11 ` Michal Nazarewicz
2017-03-25 16:46 ` Andreas Politz
2017-03-24 17:56 ` Stephen Leake
2017-03-23 15:27 ` Eli Zaretskii
2017-03-24 9:02 ` martin rudalics
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xa1tpogihq4y.fsf@mina86.com \
--to=mina86@mina86.com \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=npostavs@users.sourceforge.net \
--cc=rudalics@gmx.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.