From: Junio C Hamano Date: Wed, 28 Jun 2006 09:56:46 GMT Subject: Re: [PATCH 1/2] rebase: check for errors from git-commit Message-ID: <7vmzbx38o1.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20060628095454.GA23948@soma> Eric Wong writes: > Junio C Hamano wrote: >> Eric Wong writes: >> >> > Junio C Hamano 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? > > Actually RESOLVEMSG in git-rebase just tells the user about the > --continue, --skip, --abort options. Yup, so telling the user to disregard what commit might say (but do not hide it by redirecting 2>/dev/null, please) and dying with "$RESOLVEMSG" might be a better way.