git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: hook for rebase --continue

From
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Nov 10, 2011, 00:50 UTC
Message-ID
<4EBB1FDE.7020006@gmail.com>
In-Reply-To
<4EBB1F17.4060907@gmail.com>
On 11/9/2011 6:47 PM, Neal Kreitzinger wrote:
Show 20 quoted lines
> On 11/7/2011 1:42 PM, Matt Graham wrote:
>> I did some testing and it appears that during a rebase, if I resolve
>> a conflict and call git rebase --continue, the pre-commit hook
>> doesn't run. This means that if I don't resolve the conflict
>> correctly, our check for invalid syntax doesn't get run and creates
>> the risk that someone could push code with invalid syntax, not
>> realizing that the check didn't run.
>>
>> Does anyone else share my expectation that the pre-commit hook
>> should run during a rebase? Or at least for the first commit
>> following a rebase conflict?
>>
>> If not, is there another hook that is triggered by a rebase that I
>> should be using instead?
>>
> You could try creating an alias (e.g. "git rebase-continue") in your
> gitconfig that runs the desired validation logic and then executes git
> rebase --continue. Then you would run "git rebase-continue" instead of "git rebase
> --continue".
>
correction: added the --continue option in the alias example above.
--neal
Previous: Neal KreitzingerNext: Neal Kreitzinger
Message 4 of 5 in “hook for rebase --continue”
  1. Matt GrahamNov 7, 2011
  2. Martin FickNov 7, 2011
  3. Neal KreitzingerNov 10, 2011
  4. Neal KreitzingerNov 10, 2011
  5. Neal KreitzingerNov 15, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.