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

Re: [PATCH 1/2] rebase: check for errors from git-commit

From
Junio C Hamano <junkio@cox.net>
Date
Jun 28, 2006, 09:49 UTC
Message-ID
<7vveql38zr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20060628093322.GA29036@hand.yhbt.net>
Eric Wong <normalperson@yhbt.net> writes:
Show 9 quoted lines
> Junio C Hamano <junkio@cox.net> wrote:
>
>> Anticipating failure from "git-commit" is the right thing to do,
>> but this is a "Now what?" situation.  What is the expected
>> course of action to recover from this for the end user, and how
>> can we phrase the error message to help that process?
>
> I would expect git-commit to show the correct error message (or the
> pre-commit hook), die "$RESOLVEMSG" might be a better option, though.

It would say 'resolve conflicts, mark them with update-index as necessary, and say git-commit' or somesuch. I am not sure you would want the user to make a commit like suggested -- instead you would want him to say 'git rebase --continue' wouldn't you?

Previous: Eric WongNext: Eric Wong
Message 2 of 4 in “Re: [PATCH 1/2] rebase: check for errors from git-commit”
  1. Eric WongJun 28, 2006
  2. Junio C HamanoJun 28, 2006
  3. Eric WongJun 28, 2006
  4. Junio C HamanoJun 28, 2006

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.