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.