# rebase -i reword converts to pick on pre-commit non-zero exit 4 messages from 2012-02-01 to 2012-02-02. Participants: Neal Kreitzinger, Andrew Wong. Thread: https://gitlist.dev/t/29506 ## Neal Kreitzinger, 2012-02-01 21:27 Subject: rebase -i reword converts to pick on pre-commit non-zero exit Message-ID: URL: https://gitlist.dev/e/jgcaoh%24d9q%241%40dough.gmane.org ``` When interactive rebase does the reword command it runs the pre-commit hook for that commit (a). If the pre-commit hook gives a non-zero exit then interactive rebase picks commit (a) and continues to the next commit (b) in the rebase-to-do-list. 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? Otherwise, you have to run another rebase after the rejected rewords and edit those commits to accomplish the rewords. v/r, neal ``` ## Neal Kreitzinger, 2012-02-01 21:28 Subject: Re: rebase -i reword converts to pick on pre-commit non-zero exit Message-ID: <4F29AE8E.6070109@gmail.com> URL: https://gitlist.dev/e/4F29AE8E.6070109%40gmail.com In-Reply-To: ``` On 2/1/2012 3:27 PM, Neal Kreitzinger wrote: > When interactive rebase does the reword command it runs the pre-commit hook > for that commit (a). If the pre-commit hook gives a non-zero exit then > interactive rebase picks commit (a) and continues to the next commit (b) in > the rebase-to-do-list. 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? Otherwise, you have to run another rebase after the > rejected rewords and edit those commits to accomplish the rewords. > git 1.7.1 v/r, neal ``` ## Andrew Wong, 2012-02-02 04:12 Subject: Re: rebase -i reword converts to pick on pre-commit non-zero exit Message-ID: <4F2A0D4B.6000001@sohovfx.com> URL: https://gitlist.dev/e/4F2A0D4B.6000001%40sohovfx.com In-Reply-To: <4F29AE8E.6070109@gmail.com> ``` 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. ``` ## Neal Kreitzinger, 2012-02-02 16:21 Subject: Re: rebase -i reword converts to pick on pre-commit non-zero exit Message-ID: <4F2AB824.2030609@gmail.com> URL: https://gitlist.dev/e/4F2AB824.2030609%40gmail.com 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 ```