From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: Merge to master fails due to pre-commit hooks Date: Sun, 13 Aug 2023 08:18:45 +0800 Message-ID: References: <831qg8dt7b.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6861"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 13 02:20:02 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 1qUypu-0001cU-RS for ged-emacs-devel@m.gmane-mx.org; Sun, 13 Aug 2023 02:20:02 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUyp2-0007V9-Or; Sat, 12 Aug 2023 20:19:08 -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 1qUyp0-0007Ui-R8 for emacs-devel@gnu.org; Sat, 12 Aug 2023 20:19:06 -0400 Original-Received: from sonic308-10.consmr.mail.ne1.yahoo.com ([66.163.187.33]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUyoy-0004jQ-DT for emacs-devel@gnu.org; Sat, 12 Aug 2023 20:19:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1691885940; bh=FvgmrTw/ux6sWza6XTx5ag/De3pCBIyoub28TIn0UnI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=qjQUOb0RRM0MDypIBE4J1gCK279yI63sl3cPx4dIKa3GuBUHWCqAjldRDe3ioSiXq1qDogaudb9LJPNvMDxf0mAIzymwY+h4BCx0ZmuVAJk5DXvv+7f678Fvi7vbqIeix+ZqwdK5WFdftjvTFnNKKYNadtszFUsPLA6PNeWm6xHbrq+a32ixlwQ9Z6699SnsVQlQeIOBVjydjR/Jr231ED/3ZPfhdDaB1SIzlmQBkvfQCkyxtKP5Lq1qFSfmKWF98EX//tw0jVQkhSchPYa7Rc3zebn3eN9FGSCl6R52kE7+roMOwEmXpEvOcny/MEwubgong8x5S1pK0Tokzqq6Mw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1691885940; bh=8vwwoF3liFG6L1B3/M3pmI4dq8YOk53z3sUhYWgbVDD=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=NDLxOvGpazVevK9usSpF7wZ4umSjEX5ZxYhvPzX1LcAL9cTaKMW4jsfRZbOiDMQiRRz2g64gGrTbYcHC4s2PJfwq6dnyIIvlPLYC4YHt6EGjW403RMF/fL/aKCRp9IhVEQv4NwDF9FOYrXmyBbsaDNNP58yX8lx3S8Xzt8qHUpOhscJ+Dc4XsIgDkKaL9tGsstcWOQPDXsh0Ihjr3nbma+F1o0VH93ZCGsk7RCRoysIcC4/s80x6LCzXyywc47EOYRc6uq5icxza90gxRLfnxvnOfPV7NfL+UWcWJMPJ/LU72i7lKLY5ADTXjhVERbRoDgjibcpXzWRexVR6AJZ17A== X-YMail-OSG: TyAdlsoVM1mv6X.kdLpfWRLLa7WmLO_dInO6B8VnTuSPDryIIKRGYO1SFXXuexc pzYbEgj7GWw2vY6s0wrNz1N5Tdi9.hCwHv6cjtToLly0cP2onjYbc2IFh2JtwLUproQMj4_BzKBe 1d2jujaw3vZu8wDq8YvqZqN35BKrwZE2_behzrbSUeiCLCJxJR1SVXc0ZNCczLmcIPwyBum2YESc KU7TrdrdCUnlPr2eY7EdwV.dWKAuuj8lHROjpVah7_EWr9MPZ2Go82sNgTjdCNvarQep7RZ7YZCU 7OKwCXZgiBQmhkhxQURkrPrjYecNjXBs2jwrHFBoemLKG44siEKMxjzTlRV2CEwnQVxXe0RpQn8S VKxzliYf0HfFjAoAMVwKkMDPfOkmubwbZZ154ZOtf7g9Q3Ayj5fUsUn7cPcKG5xspSThNa1hreA1 Tqb5cYo8kDyGpD8NJMcFrjsX3j6Rd7yjNmSMnfNk3.EaHmuWFVBh6C8ShHMZJRajSWPU_A5pCtHN aJv3FQXhgT.PJ.7nvrwcshcMQ2t1hw8EZ338XC7KATH3A.zSdz_YNWvdCvuUNWi3wfcbERB7xWeC d5RVJVAOnIL2jhWom_LZZeCyoRp0ielQnSINO9EEBo2VffOPv0O_JSH5Vv3kYyN8B3RkmEoehWrr vZ3rQ14DxPVYZksh8RriILsqbC8BwOEhVKv9Azr8SzlUiikBRw7pWI.459C0yD_84zezwEc5BI09 UH6.4zINdTybEH.HbBZLasdRjEFt913HGa19w16O_uPE093HozLn45AwN0tlXmYNvMxh.ILFzd7B 5.XVUylJG4P7EGlV3cITMlbpZgBwbfNn8c0z7lj.6P X-Sonic-MF: X-Sonic-ID: 804c6f50-ac4f-4159-a0c4-edcfd1c2bd82 Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ne1.yahoo.com with HTTP; Sun, 13 Aug 2023 00:19:00 +0000 Original-Received: by hermes--production-sg3-69654d8bd-52vxq (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID fcb42b9f7cda619be9c298525607ebe2; Sun, 13 Aug 2023 00:18:55 +0000 (UTC) In-Reply-To: <831qg8dt7b.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 12 Aug 2023 21:14:00 +0300") X-Mailer: WebService/1.1.21695 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.187.33; envelope-from=luangruo@yahoo.com; helo=sonic308-10.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:308633 Archived-At: 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.