Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:80228 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 47580 invoked from network); 6 Jan 2015 11:27:01 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 6 Jan 2015 11:27:01 -0000 Authentication-Results: pb1.pair.com header.from=derick@php.net; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=derick@php.net; spf=unknown; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 82.113.146.227 as permitted sender) X-PHP-List-Original-Sender: derick@php.net X-Host-Fingerprint: 82.113.146.227 xdebug.org Linux 2.6 Received: from [82.113.146.227] ([82.113.146.227:38411] helo=xdebug.org) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 6E/B2-26786-486CBA45 for ; Tue, 06 Jan 2015 06:27:01 -0500 Received: from localhost (localhost [IPv6:::1]) by xdebug.org (Postfix) with ESMTPS id 04486EA085; Tue, 6 Jan 2015 11:26:57 +0000 (GMT) Date: Tue, 6 Jan 2015 11:26:57 +0000 (GMT) X-X-Sender: derick@whisky.home.derickrethans.nl To: Nikita Popov cc: Stanislav Malyshev , PHP Internals In-Reply-To: Message-ID: References: <54AB172E.6040901@gmail.com> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: Re: [PHP-DEV] Cleaning up dangling whitespace From: derick@php.net (Derick Rethans) On Tue, 6 Jan 2015, Nikita Popov wrote: > On Mon, Jan 5, 2015 at 11:58 PM, Stanislav Malyshev > 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. cheers, Derick