This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: glibc.git: hook to prohibit pushing "bad-merge" commits
- From: Jim Meyering <jim at meyering dot net>
- To: Andreas Schwab <schwab at linux-m68k dot org>
- Cc: Petr Baudis <pasky at suse dot cz>, "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Tue, 30 Nov 2010 08:09:35 +0100
- Subject: Re: glibc.git: hook to prohibit pushing "bad-merge" commits
- References: <8763fpkzp4.fsf@meyering.net> <87iqjcwka9.fsf@meyering.net><20101129202221.GX8806@machine.or.cz> <m2eia3x1jv.fsf@igel.home>
Andreas Schwab wrote:
> Petr Baudis <pasky@suse.cz> writes:
>
>> I added .gitattributes entry INSTALL -whitespace in the same commit,
>
> You'll probably need to push that separately.
Hi Andreas,
Unfortunately, even if you commit and push the .gitattributes change
first, the hook still prohibits the subsequent push. As Pasky guessed,
the .gitattributes file is not honored when "git diff" is run in the
context of the bare server-side repository.
That is why I ended up adding the hook infrastructure that allows
running designated commands on the server, e.g., to toggle the
allowbadwhitespace configure flag.