all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Merge to master fails due to pre-commit hooks
@ 2023-08-12 18:14 Eli Zaretskii
  2023-08-13  0:18 ` Po Lu
  0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2023-08-12 18:14 UTC (permalink / raw)
  To: Po Lu; +Cc: emacs-devel

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?



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Merge to master fails due to pre-commit hooks
  2023-08-12 18:14 Merge to master fails due to pre-commit hooks Eli Zaretskii
@ 2023-08-13  0:18 ` Po Lu
  2023-08-13  5:22   ` Eli Zaretskii
  0 siblings, 1 reply; 3+ messages in thread
From: Po Lu @ 2023-08-13  0:18 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: emacs-devel

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.



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Merge to master fails due to pre-commit hooks
  2023-08-13  0:18 ` Po Lu
@ 2023-08-13  5:22   ` Eli Zaretskii
  0 siblings, 0 replies; 3+ messages in thread
From: Eli Zaretskii @ 2023-08-13  5:22 UTC (permalink / raw)
  To: Po Lu; +Cc: emacs-devel

> 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.



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-08-13  5:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-12 18:14 Merge to master fails due to pre-commit hooks Eli Zaretskii
2023-08-13  0:18 ` Po Lu
2023-08-13  5:22   ` Eli Zaretskii

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.