From: Jeff King <peff@peff.net>
Date: Thu, 26 Mar 2015 13:20:15 GMT
Subject: Re: [PATCH] merge: deprecate 'git merge <message> HEAD <commit>' syntax
Message-ID: <20150326132014.GA16427@peff.net>
In-Reply-To: <xmqqvbhoz75m.fsf@gitster.dls.corp.google.com>

On Wed, Mar 25, 2015 at 09:58:45PM -0700, Junio C Hamano wrote:

> We had this in "git merge" manual for eternity:
> 
>     'git merge' <msg> HEAD <commit>...
> 
>     [This] syntax (<msg> `HEAD` <commit>...) is supported for
>     historical reasons.  Do not use it from the command line or in
>     new scripts.  It is the same as `git merge -m <msg> <commit>...`.

It would be nice to see this ancient wart ago. I agree we need a
deprecation period, though, as you've outlined here.

>  builtin/merge.c               | 1 +
>  git-cvsimport.perl            | 2 +-
>  git-pull.sh                   | 2 +-
>  t/t3402-rebase-merge.sh       | 2 +-
>  t/t6021-merge-criss-cross.sh  | 6 +++---
>  t/t9402-git-cvsserver-refs.sh | 2 +-
>  6 files changed, 8 insertions(+), 7 deletions(-)

Maybe squash in:

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 27c3d73..2af1bee 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -24,7 +24,7 @@ test_expect_success 'prepare repository' '
 '
 
 test_expect_success 'Merge with d/f conflicts' '
-	test_expect_code 1 git merge "merge msg" B master
+	test_expect_code 1 git merge -m "merge msg" master
 '
 
 test_expect_success 'F/D conflict' '


We do not call it HEAD here, but the setup test just before has put us
on branch B, so I think it is equivalent.

-Peff