From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Merge to master fails due to pre-commit hooks
Date: Sat, 12 Aug 2023 21:14:00 +0300
Message-ID: <831qg8dt7b.fsf@gnu.org>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="38868"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: emacs-devel@gnu.org
To: Po Lu <luangruo@yahoo.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Aug 12 20:14:23 2023
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane-mx.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1qUt82-0009vR-LS
	for ged-emacs-devel@m.gmane-mx.org; Sat, 12 Aug 2023 20:14:22 +0200
Original-Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces@gnu.org>)
	id 1qUt7D-0002aI-8V; Sat, 12 Aug 2023 14:13:31 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>) id 1qUt7B-0002VP-LB
 for emacs-devel@gnu.org; Sat, 12 Aug 2023 14:13:29 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1qUt7B-0007XR-CP; Sat, 12 Aug 2023 14:13:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=Subject:To:From:Date:mime-version:in-reply-to:
 references; bh=jyYY++OSTQ4SVb+xzrKY7+64lXGzvh3wYdTi37WhS8o=; b=OCG3brYpAtnGsD
 IIH8anpOf/EzpwSjcQxh+PdsYD9l0ds4rUGQT3jh7q+exoOlxlYkSxDAsBtk2S8C19L0isCqY/sje
 /5fBlzZj90wIq+Xb+OoTyflpXGuXH7IH6yt45qlkZjXh3tk2Fa+VQ/BwWK0C8lhbZj2MzcdEUdJSD
 eDBUWeLJKb9XdUHoD9RKB1Dh1VikT44YptLbHLeIT4JUX0fKZkgHf/tGLBQpCmFANHM3GYUXGetAF
 Gx2vHfLQS4eoxaSkIAAQDkScLHMLc9F1djf9FAxjbvoADg/YQ1ZK9pBu7KcDsv/EFrrSQNmP7kXed
 HILTwHdbhTDZCrCCNtww==;
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Xref: news.gmane.io gmane.emacs.devel:308624
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/308624>

Several files that came from the Android branch trigger pre-commit
hooks and prevent committing merges.  Examples: INSTALL.java (it
includes diffs, and those have trailing spaces on some lines),
ChangeLog.android (which triggers a strange error message regarding
characters in its file name), and others.

How were those files committed without fixing all those problems?  And
in those cases where the "problems" are actually false positives, how
can we avoid failing commits without having to use --no-verify switch
to Git?