[ 
https://issues.apache.org/jira/browse/MESOS-4331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15091909#comment-15091909
 ] 

Benjamin Bannier commented on MESOS-4331:
-----------------------------------------

As a workaround I recalculate `FIRST_LINE` in the hook,
{code}
FIRST_LINE=$(head -n1 $1)
FIRST_LINE=${FIRST_LINE##'fixup! '}
{code}

This allows commits starting with {{fixup!}} on my side, but would also let me 
wrongly push these to reviewboard.

> git commit-msg hook completely breaks fixup commits
> ---------------------------------------------------
>
>                 Key: MESOS-4331
>                 URL: https://issues.apache.org/jira/browse/MESOS-4331
>             Project: Mesos
>          Issue Type: Bug
>            Reporter: Benjamin Bannier
>
> https://reviews.apache.org/r/41586/ added a git hook to check the commit 
> message format. This completely breaks fixup commits which can be created with
> {code}
> % git commit --fixup=$SHA1 
> {code}
> The resulting commit message will then be the one of {{$SHA1}}, but prefixed 
> with {{fixup!}} (followed by a literal space). Tools like {{git rebase}} can 
> automatically use these to e.g., squash matching commits like
> {code}
> % git rebase -i origin/master --autosquash
> {code}
> Here all commits for e.g., {{$SHA1}} would be grouped together and squash 
> automatically which is valuable when working on reviews.
> We should find a way to reenable such functionality; otherwise we risk that 
> developers completely disable this hook.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Reply via email to