Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:80229
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.212.178 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.11.1501061125460.4080@whisky.home.derickrethans.nl>
References: <54AB172E.6040901@gmail.com>
	<CAF+90c89ES=C17FSbEwF+9zoudVpR+WE_TG7x6QmVqC--GnTuA@mail.gmail.com>
	<alpine.DEB.2.11.1501061125460.4080@whisky.home.derickrethans.nl>
Date: Tue, 6 Jan 2015 12:33:15 +0100
Message-ID: <CAF+90c8eNPGFZ+pf838QXJHc6j90xnOM-GWiFfn8P=hXbeKcVg@mail.gmail.com>
To: Derick Rethans <derick@php.net>
Cc: Stanislav Malyshev <smalyshev@gmail.com>, PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=047d7bf0c538448e65050bfa2c53
Subject: Re: [PHP-DEV] Cleaning up dangling whitespace
From: nikita.ppv@gmail.com (Nikita Popov)

--047d7bf0c538448e65050bfa2c53
Content-Type: text/plain; charset=UTF-8

On Tue, Jan 6, 2015 at 12:26 PM, Derick Rethans <derick@php.net> wrote:

> On Tue, 6 Jan 2015, Nikita Popov wrote:
>
> > On Mon, Jan 5, 2015 at 11:58 PM, Stanislav Malyshev <smalyshev@gmail.com
> >
> > wrote:
> >
> > > The code in the PHP source repo has a lot of random dangling
> > > whitespace at the end of lines, which looks sloppy and produces some
> > > weird effects in diffs because some editors auto-clean it and some
> > > do not. I'd like to clean it up (it's easy to do automatically) in
> > > master, but this produces a big patch that may also create some
> > > conflicts with existing pull reqs (easily resolved, but still). So,
> > > I'd like to ask if there are any objections to such cleanup? If not,
> > > then I'll do it, probably next weekend.
>
> Don't do it for just master, it makes automatic merging possibly a pain.
> It should go to all "alive" branches, with properly merged up commits.
>
> > No objection to whitespace cleanup. iirc git even has options to
> > ignore whitespace changes on merge/rebase.
> >
> > It would be nice to also add a pre-commit hook stripping trailing
> > whitespace, to avoid this happening again.
>
> That would change a commit hash, or cause an extra commit. No thanks.
>

This is not how pre-commit hooks work.

If we only want to check (as opposed to automatically fix), it would be
enough to recommend enabling the default pre-commit hook in our git
guidelines.

Nikita

--047d7bf0c538448e65050bfa2c53--