From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 09 Feb 2012 18:50:53 GMT
Subject: Re: git merge <tag>: Spawning an editor can't be disabled
Message-ID: <4F34158D.3030903@kdbg.org>
In-Reply-To: <7vzkcrx4f2.fsf@alter.siamese.dyndns.org>

Am 09.02.2012 19:11, schrieb Junio C Hamano:
> If the editor is not spawned, there is no way for the user to review the
> result of signature verification before deciding to accept the merge.
> "git merge --no-edit v1.7.2" could error out saying "you cannot create
> this merge without reviewing".  Or it could behave as if it was asked to
> "git merge --no-edit v1.7.2^0", dropping the signature verification and
> recording part altogether.

It should behave as if the editor was spawned and the user did not
change the content of the commit message.

Use case: First, you merge ordinarily, that is, you review the signature
and the contents, and you are satisfied. Shortly later, you discover
that a fix should be applied before the merge. So you rewind the branch
before the merge, and commit the fix. Now you can repeat the merge with
--no-edit because you have already seen the contents.

Contrived? Dunno.

-- Hannes