From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: Andrew Wong <andrew.w@sohovfx.com>
Cc: Neal Kreitzinger <neal@rsss.com>, git@vger.kernel.org
Subject: Re: rebase -i reword runs pre-commit hook with curious results
Date: Thu, 02 Feb 2012 10:39:55 -0600 [thread overview]
Message-ID: <4F2ABC5B.2030608@gmail.com> (raw)
In-Reply-To: <4F2A2286.3090808@sohovfx.com>
On 2/1/2012 11:43 PM, Andrew Wong wrote:
> On 12-02-01 4:50 PM, Neal Kreitzinger wrote:
>> I'm confused on why and/or how interactive rebase runs the pre-commit
>> hook
>> when doing the reword command for commit (a).
> When you do a "reword" in "rebase -i", it basically does a "cherry-pick"
> of that commit first, then it does a "commit --amend". And your
> pre-commit hook should've been run during the amend.
>> IOW, the pre-commit hook does not get the same results as if I were
>> doing a
>> commandline git-commit of a modified index.
> Does your pre-commit hook work when doing a "commit --amend"? I'm not
> sure if you can actually modify the author (or committer) date from
> inside a pre-commit hook.
(We have a comment on "line 1" in our source with $User:$ $Date:$
keywords that the pre-commit hooks expands to insert "whoami" and "date"
values to effect a user-datestamp at commit time. We do this to enforce
conflicts on same-file edits.) Now that I understand that the
cherry-pick takes place first to effect the transfer of the tree content
and then a subsequent git-commit --amend of "no changes" takes place to
effect the reword opportunity, the behavior makes sense now. (We use
git-commit --amend to reword commit messages also.) The pre-commit hook
runs prior to commit message editor just like commandline git-commit
--amend (and plain git-commit).
thanks!
v/r,
neal
prev parent reply other threads:[~2012-02-02 16:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-01 21:50 rebase -i reword runs pre-commit hook with curious results Neal Kreitzinger
2012-02-02 5:43 ` Andrew Wong
2012-02-02 16:39 ` Neal Kreitzinger [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F2ABC5B.2030608@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=andrew.w@sohovfx.com \
--cc=git@vger.kernel.org \
--cc=neal@rsss.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.
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 NNTP newsgroup(s).