All of lore.kernel.org
 help / color / mirror / Atom feed
From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: Andrew Wong <andrew.w@sohovfx.com>
Cc: git@vger.kernel.org
Subject: Re: rebase -i reword converts to pick on pre-commit non-zero exit
Date: Thu, 02 Feb 2012 10:21:56 -0600	[thread overview]
Message-ID: <4F2AB824.2030609@gmail.com> (raw)
In-Reply-To: <4F2A0D4B.6000001@sohovfx.com>

On 2/1/2012 10:12 PM, Andrew Wong wrote:
> On 12-02-01 4:28 PM, Neal Kreitzinger wrote:
>> Instead of picking commit (a) when the pre-commit hook exits
>> non-zero on the reword command, shouldn't interactive rebase learn
>> to edit commit (a) and tell the user that because the pre-commit
>> hook exited non-zero they need to either remedy the pre-commit hook
>> violations and run git commit --amend or run git commit --amend
>> --no-verify to bypass the pre-commit hook?
>
> Yup, I've submitted a patch to address this issue a while ago. This
> new behavior should be in v.1.7.8.2 and later.

I now see that this 1.7.8.2 release note applies:

  * When a "reword" action in "git rebase -i" failed to run "commit 
--amend",
    we did not give the control back to the user to resolve the
situation, and
    instead kept the original commit log message.

thanks!

v/r,
neal

      reply	other threads:[~2012-02-02 16:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-01 21:27 rebase -i reword converts to pick on pre-commit non-zero exit Neal Kreitzinger
2012-02-01 21:28 ` Neal Kreitzinger
2012-02-02  4:12   ` Andrew Wong
2012-02-02 16:21     ` 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=4F2AB824.2030609@gmail.com \
    --to=nkreitzinger@gmail.com \
    --cc=andrew.w@sohovfx.com \
    --cc=git@vger.kernel.org \
    /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 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.