From: Eli Zaretskii <eliz@gnu.org>
To: Po Lu <luangruo@yahoo.com>
Cc: emacs-devel@gnu.org
Subject: Merge to master fails due to pre-commit hooks
Date: Sat, 12 Aug 2023 21:14:00 +0300 [thread overview]
Message-ID: <831qg8dt7b.fsf@gnu.org> (raw)
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?
next reply other threads:[~2023-08-12 18:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-12 18:14 Eli Zaretskii [this message]
2023-08-13 0:18 ` Merge to master fails due to pre-commit hooks Po Lu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=831qg8dt7b.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=luangruo@yahoo.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.