From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Trouble merging line-numbers branch into master Date: Sat, 8 Jul 2017 08:05:44 -0400 Message-ID: References: <20170707212353.GA2428@acm> <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> <83inj3l5gi.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1499515615 24222 195.159.176.226 (8 Jul 2017 12:06:55 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 8 Jul 2017 12:06:55 +0000 (UTC) Cc: Alan Mackenzie , Paul Eggert , Emacs developers , Kaushal Modi To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jul 08 14:06:51 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dToVe-00063e-FP for ged-emacs-devel@m.gmane.org; Sat, 08 Jul 2017 14:06:50 +0200 Original-Received: from localhost ([::1]:32768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dToVj-0006LF-T5 for ged-emacs-devel@m.gmane.org; Sat, 08 Jul 2017 08:06:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dToVe-0006LA-8g for emacs-devel@gnu.org; Sat, 08 Jul 2017 08:06:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dToVd-0006ay-Ef for emacs-devel@gnu.org; Sat, 08 Jul 2017 08:06:50 -0400 Original-Received: from mail-oi0-f51.google.com ([209.85.218.51]:33514) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dToVZ-0006Zm-OD; Sat, 08 Jul 2017 08:06:45 -0400 Original-Received: by mail-oi0-f51.google.com with SMTP id p188so45767094oia.0; Sat, 08 Jul 2017 05:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=FKWF+zF8ZGU+AvqQPF5vxJILgMTN01e82oV0/8kJKnM=; b=sFPcX8PGTrJZ9DW9l7mvHav9exPoUrjM0dPCi5HHKlNFTTc81pNks2U7vGdYd4uh35 eQiotvayYHIDGH9FqIDgpOz4Mw5FbFvSLZjhb05zkrYOjwHPnlVc/Nm7XpchXcYv4kVD OKKqKXz+0KDKf6HZdX1ZmnzPhiFYNLMOjTtOy5sJdw58KFFRL50Mb7OH8MAea+al03ew IlzOIELSA0/eBRPLpj6NteKRHIxbn/lXYPVuYxVtmdqpypdMoZWif/horp9xnkyItFci qqXFi87odNpJxetMzk+AC0ZkVsvDQ0LPvSUHUu7jzpN55sWZPAZAPkWN7XfNT9RbAIBd Z/MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=FKWF+zF8ZGU+AvqQPF5vxJILgMTN01e82oV0/8kJKnM=; b=b2Rcq4EOixXVPPScXabDa/MR6o3Di/ElHT1AQAIYS9SqY8qGIQO8zMqq+KwS3majgB jQYFuvk1HvzM2p+UpR/kDvr/k2c2HpiTkQpolRoI42E7HJxasSgUmh9WBTQn32bflbFF ea54WYa7aLzNR6O+dUo+cR5VeES+Zvmenr/LGJLuS5rEqWnmdD5LAjlD0CfuOCn3SmZg G9L55YuAT9DxWJrGvQmWKHQX6LOtlw8lNnUg2cB+GorkpawzlzKI4BTrOqdVbDyhefUn Z6gLwqmh4vCSL79Y1A549H2ITrX1Abtpis05xY9AjlKeQodABm2cqW0qz+IX6nItVqUi LrRw== X-Gm-Message-State: AIVw111gatnz4rvFt75N71KuEn8bf6vJkfKxp3kQIUL76skUhX8jZn6C J+aDvvnKAea/Ba6SGplczb87gp8n5gsi X-Received: by 10.202.69.197 with SMTP id s188mr3191509oia.148.1499515544762; Sat, 08 Jul 2017 05:05:44 -0700 (PDT) Original-Received: by 10.74.113.91 with HTTP; Sat, 8 Jul 2017 05:05:44 -0700 (PDT) In-Reply-To: <83inj3l5gi.fsf@gnu.org> X-Google-Sender-Auth: MUt5UhPulRTv_qAd-KmOIxFNvug X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.218.51 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:216320 Archived-At: On Sat, Jul 8, 2017 at 4:04 AM, Eli Zaretskii wrote: > > I've just merged the branch, and didn't have any such problems. In > the diffs I see no changes due to whitespace only, and the only merge > conflict I had, in NEWS, had nothing to do with whitespace and was > resolved without introducing any whitespace. > > So I really don't understand what is this all about. If SPC followed > by a TAB is detected when you merge, it was already there in master > before the merge, and the merge itself is not the problem. The old git hook checks *both* sides of the merge, so changes introduced on the master branch after you branched off would also trigger the error, but only if you happen to hit a conflict or otherwise end up editing the merge commit message for some other reason (e.g., using a dumb terminal which can't run $EDITOR). The latter confusing condition is why the hook was changed to only check the newly merged in changes, but you need to run './autogen git' to update it in your local copy (I assume Kaushal had not done so, hence the error). >> Slowly and gradually, as more merges and commits happen in future, all such mixtures of tabs+spaces will >> get removed. > > They cannot be removed completely, because indentation doesn't always > end in a column whose number is an integral multiple of the tab width. I believe git only complains about tab following spaces, not spaces following tabs.