Merge to master fails due to pre-commit hooks

Merge to master fails due to pre-commit hooks

[Eli Zaretskii]

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?

Re: Merge to master fails due to pre-commit hooks

[Po Lu]

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.

Re: Merge to master fails due to pre-commit hooks

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Cc: emacs-devel@gnu.org
> Date: Sun, 13 Aug 2023 08:18:45 +0800
> 
> 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.

Maybe you don't have the up-to-date hooks in your repository?  They
are updated when you use autogen.sh, AFAIR.