Re: automatically preventing merge commits on master

[Jim Meyering]

Bruno Haible wrote:
> Oops, I did it again. This time, I have a history of what I did, and I'm sure
> I worked in a single gnulib checkout:
>
> - Did a "git commit" of some change, but did not push it.
> - In the meantime you did your commit.
> - Then, in rapid sequence:
>     git pull
>     git commit ChangeLog modules/uninorm/u*-normcmp
>     git push
...
> Well, obviously something is wrong with the commit hook again...

The hook that detects that was out of date.
I fixed that bug months ago for coreutils, and thought I had
thus fixed the hook for all other projects using it
by virtue of *.git/hooks/update all being symlinks
to the same master script.

Either I never did that for "update" or somehow it was undone,
because only the post-receive hook was a symlink.

Anyway, it's fixed now.