From: Po Lu <luangruo@yahoo.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merge to master fails due to pre-commit hooks
Date: Sun, 13 Aug 2023 08:18:45 +0800 [thread overview]
Message-ID: <s0dy1ifu74q.fsf@yahoo.com> (raw)
In-Reply-To: <831qg8dt7b.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 12 Aug 2023 21:14:00 +0300")
Eli Zaretskii <eliz@gnu.org> 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.
next prev parent reply other threads:[~2023-08-13 0:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-12 18:14 Merge to master fails due to pre-commit hooks Eli Zaretskii
2023-08-13 0:18 ` Po Lu [this message]
2023-08-13 5:22 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s0dy1ifu74q.fsf@yahoo.com \
--to=luangruo@yahoo.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).