From: Antoine Pelisse <apelisse@gmail.com>
To: Orgad Shaneh <orgads@gmail.com>, Pat Thoyts <patthoyts@gmail.com>
Cc: John Keeping <john@keeping.me.uk>, git <git@vger.kernel.org>
Subject: Re: git gui replaces amend message when prepare-commit-msg hook is used
Date: Fri, 5 Jul 2013 21:13:42 +0200 [thread overview]
Message-ID: <CALWbr2y52fHae=svf6vct1gRR-o1ocG_iF3yppHDipx1jjuODg@mail.gmail.com> (raw)
In-Reply-To: <CAGHpTBJhwzLdxiTynx-eBWj7wUwe4e6HPAB4g0jDHTeVF2rfeg@mail.gmail.com>
On Thu, Jul 4, 2013 at 2:46 PM, Orgad Shaneh <orgads@gmail.com> wrote:
> On Thu, Jul 4, 2013 at 3:42 PM, Antoine Pelisse <apelisse@gmail.com> wrote:
>>>> Your problem is that your hook script is not checking $2 so it is
>>>> overwriting the message even when you do not want to do so.
>>>
>>> No, it isn't. Not by git-gui at least. Check /tmp/hook.log with the
>>> hook I provided...
>>
>> So what you mean is that the hook is not executed with the correct parameters?
>> Could you please provide the output of the /tmp/hook.log file (I can't
>> reproduce right now) ?
>
> It only runs for "New commit" (possibly with merge or squash as
> arguments). In my case the log is:
> .git/PREPARE_COMMIT_MSG
> .git/PREPARE_COMMIT_MSG
> .git/PREPARE_COMMIT_MSG
> ...
>
> Not running the hook for amend is another problem.
>
> What I referred to was that handling the hook's result is done without
> checking if the state has changed while it was running, like Fredrik
> has already pointed out.
Yep, I've had a quick look at that, and clearly the problem seems to
come from git-gui.
I have absolutely no knowledge of TCL so I won't be able to help.
Indeed, from what I've seen it looks like prepare-commit-message hook
is not called in amend case.
I cc'ed Pat Thoyts as he's the maintainer of git-gui.
Sorry for not being able to help any further on this one.
Antoine,
prev parent reply other threads:[~2013-07-05 19:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 9:47 git gui replaces amend message when prepare-commit-msg hook is used Orgad Shaneh
2013-07-04 10:01 ` Fredrik Gustafsson
2013-07-04 10:03 ` Orgad Shaneh
2013-07-04 10:21 ` Fredrik Gustafsson
2013-07-04 10:34 ` John Keeping
2013-07-04 10:59 ` Orgad Shaneh
2013-07-04 11:17 ` Fredrik Gustafsson
2013-07-04 11:19 ` John Keeping
2013-07-04 11:37 ` Orgad Shaneh
2013-07-04 12:42 ` Antoine Pelisse
2013-07-04 12:46 ` Orgad Shaneh
2013-07-05 19:13 ` Antoine Pelisse [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALWbr2y52fHae=svf6vct1gRR-o1ocG_iF3yppHDipx1jjuODg@mail.gmail.com' \
--to=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=orgads@gmail.com \
--cc=patthoyts@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).