From: Luben Tuikov <ltuikov@yahoo.com>
Date: Thu, 12 Oct 2006 23:15:03 GMT
Subject: Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts
Message-ID: <20061012231503.78452.qmail@web31803.mail.mud.yahoo.com>
In-Reply-To: <7vejtdkw4t.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:
> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> > --- a/git-commit.sh
> > +++ b/git-commit.sh
> > @@ -441,7 +441,7 @@ then
> >  elif test "$use_commit" != ""
> >  then
> >  	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
> > -elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
> > +elif test -f "$GIT_DIR/MERGE_MSG"
> >  then
> >  	cat "$GIT_DIR/MERGE_MSG"
> >  elif test -f "$GIT_DIR/SQUASH_MSG"
> 
> If you rely on MERGE_MSG then you would need to clean it after
> commit is done.  Currently it does not and checks MERGE_HEAD,
> and cleans up MERGE_HEAD when it is done.  MERGE_MSG is not
> cleaned.

It is cleaned in the lines of the patch you deleted, the section
just after the "elif" above:

@@ -607,7 +607,7 @@ then
        commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
        rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
        git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
-       rm -f -- "$GIT_DIR/MERGE_HEAD" &&
+       rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
        if test -f "$NEXT_INDEX"
        then
                mv "$NEXT_INDEX" "$THIS_INDEX"

   Luben