[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git pre-commit hook for merges (WAS: master has switched from Automa
From: |
Eli Zaretskii |
Subject: |
Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) |
Date: |
Sun, 30 Apr 2017 22:40:15 +0300 |
> From: Noam Postavsky <address@hidden>
> Date: Sun, 30 Apr 2017 15:35:55 -0400
> Cc: Paul Eggert <address@hidden>, martin rudalics <address@hidden>,
> Emacs developers <address@hidden>, Andreas Schwab <address@hidden>,
> Yuri Khan <address@hidden>
>
> On Sat, Apr 29, 2017 at 10:34 PM, Eli Zaretskii <address@hidden> wrote:
> >
> > I mean that users will be surprised to see the hooks invoked when
> > cherry-picking. I know I was surprised to see the git-merge-changelog
> > utility to be invoked the first time I cherry-picked.
>
> I don't see where git-merge-changelog is being called from the hooks.
It isn't. The fact that it's invoked during cherry-picking is an
indication that cherry-picking involves a merge. I'm saying that the
first time I realized that, it was a surprise. Which means others
might be surprised to see the hooks invoked when they cherry-pick.
> With respect to the pre-commit hook, it seems that we can't play the
> same trick as with 'git merge', because CHERRY_PICK_HEAD doesn't exist
> when picking only one commit.
Yeah, figured that much. Too bad.
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), (continued)
Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Paul Eggert, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Eli Zaretskii, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Eli Zaretskii, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Eli Zaretskii, 2017/04/29
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make), Noam Postavsky, 2017/04/30
- Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make),
Eli Zaretskii <=