From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merge to master fails due to pre-commit hooks Date: Sun, 13 Aug 2023 08:22:16 +0300 Message-ID: <83ttt3cy9j.fsf@gnu.org> References: <831qg8dt7b.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5065"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 13 07:22:46 2023 Return-path: 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 ) id 1qV3Yr-000150-1t for ged-emacs-devel@m.gmane-mx.org; Sun, 13 Aug 2023 07:22:45 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qV3Yd-0003rn-2G; Sun, 13 Aug 2023 01:22:32 -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 ) id 1qV3YR-0003qm-3F for emacs-devel@gnu.org; Sun, 13 Aug 2023 01:22:19 -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 ) id 1qV3YQ-0006Bx-LR; Sun, 13 Aug 2023 01:22:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=pmwG02U+bnmYd+M3Fn8af64pJJu7tJigk8X163h6huc=; b=JzZLSgJYwcFD WclilNXGNRpEl4O+LpY9i0u2RwcnB/f0PyL8mCE1ihuuy7fm4j+lWnuLi5C6g9U6mlKSxeH0jNGXl Hcqj4cqdo9YNx1Nrx/kVNGukPIkDnCq5YdU28fWAgcs0HO7Hn67EPjy9mzi6Qoz5oHtWIpufpoS4b bOOH6Evof59fG8wlugtahIjKnJfkYy4MmYm4DjfuBSYstWGZy2bo2nl9k1omXgXLaKxbVBH1hhqKb EdZrYG7K6EtWf6VJj1o6R6JGut3YFkl9lNd/J66gz3/ti0Il8ZT7muLFCv+n+60rTE/SJGp0Y6szq JfjYbQXCYOeJjz/5OqBOlw==; In-Reply-To: (message from Po Lu on Sun, 13 Aug 2023 08:18:45 +0800) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-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:308648 Archived-At: > From: Po Lu > Cc: emacs-devel@gnu.org > Date: Sun, 13 Aug 2023 08:18:45 +0800 > > Eli Zaretskii writes: > > > 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? > > More importantly, how come I never encountered these problems? Those > are certainly false positives, and I never used --no-verify. Maybe you don't have the up-to-date hooks in your repository? They are updated when you use autogen.sh, AFAIR.