merge: deprecate 'git merge <message> HEAD <commit>' syntax

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>...`.

With the update to "git merge" to make it understand what is
recorded in FETCH_HEAD directly, including Octopus merge cases, we
now can rewrite the use of this syntax in "git pull" with a simple
"git merge FETCH_HEAD".

Also there are quite a few fallouts in the test scripts, and it
turns out that "git cvsimport" also uses this old syntax to record
a merge.

Judging from this result, I would not be surprised if dropping the
support of the old syntax broke scripts people have written and been
relying on for the past ten years.  But at least we can start the
deprecation process by throwing a warning message when the syntax is
used.

With luck, we might be able to drop the support in a few years.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 42f9fcc1745c05f13d685981b14a9ac22f82dc77..67fbfafa027bfb8dbb7410626957a8975b89c4f5 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1299,6 +1299,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
         */
        if (!have_message &&
            is_old_style_invocation(argc, argv, head_commit->object.sha1)) {
         */
        if (!have_message &&
            is_old_style_invocation(argc, argv, head_commit->object.sha1)) {

+               warning("old-style 'git merge <msg> HEAD <commit>' is deprecated.");

                strbuf_addstr(&merge_msg, argv[0]);
                head_arg = argv[1];
                argv += 2;
                strbuf_addstr(&merge_msg, argv[0]);
                head_arg = argv[1];
                argv += 2;

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 73d367cea8f130bc7721803e397df710e7cfff58..82ecb0343a3864d1db0b066749d2087c11f689e7 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -1162,7 +1162,7 @@ sub commit {
                die "Fast-forward update failed: $?\n" if $?;
        }
        else {
                die "Fast-forward update failed: $?\n" if $?;
        }
        else {

-               system(qw(git merge cvsimport HEAD), "$remote/$opt_o");
+               system(qw(git merge -m cvsimport), "$remote/$opt_o");

                die "Could not merge $opt_o into the current branch.\n" if $?;
        }
 } else {
                die "Could not merge $opt_o into the current branch.\n" if $?;
        }
 } else {

diff --git a/git-pull.sh b/git-pull.sh
index 4d4fc77b05648c7d2d76ae932b7d68cdf411d364..15d943190c5bae23e28b5cfa63c4c99c84a5416a 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -323,7 +323,6 @@ then
        fi
 fi
 
        fi
 fi
 

-merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit

 case "$rebase" in
 true)
        eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity"
 case "$rebase" in
 true)
        eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity"


@@ -334,7 +333,7 @@ true)
        eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
        eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
        eval="$eval $gpg_sign_args"
        eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
        eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
        eval="$eval $gpg_sign_args"

-       eval="$eval \"\$merge_name\" HEAD $merge_head"
+       eval="$eval FETCH_HEAD"

        ;;
 esac
 eval "exec $eval"
        ;;
 esac
 eval "exec $eval"

diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index 5a27ec9b5eb7c37145a098d878432948233ba756..8f64505e4f94432de6cc287f4ab2f3129703536a 100755 (executable)
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -47,7 +47,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'reference merge' '
 '
 
 test_expect_success 'reference merge' '

-       git merge -s recursive "reference merge" HEAD master
+       git merge -s recursive -m "reference merge" master

 '
 
 PRE_REBASE=$(git rev-parse test-rebase)
 '
 
 PRE_REBASE=$(git rev-parse test-rebase)

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 27c3d73961dfc9b50c3eafc7360662076cb31260..2af1beec5f6f330072b3739e3c8b855f988173a9 100755 (executable)
--- 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_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' '
 '
 
 test_expect_success 'F/D conflict' '

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index d15b313d4b5e65bc583b7c1f0e4efbb5ac56cb00..213deecab1e81685589f9041216b7044243acff3 100755 (executable)
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -48,7 +48,7 @@ echo "1
 " > file &&
 git commit -m "C3" file &&
 git branch C3 &&
 " > file &&
 git commit -m "C3" file &&
 git branch C3 &&

-git merge "pre E3 merge" B A &&
+git merge -m "pre E3 merge" A &&

 echo "1
 2
 3 changed in E3, branch B. New file size
 echo "1
 2
 3 changed in E3, branch B. New file size


@@ -61,7 +61,7 @@ echo "1
 " > file &&
 git commit -m "E3" file &&
 git checkout A &&
 " > file &&
 git commit -m "E3" file &&
 git checkout A &&

-git merge "pre D8 merge" A C3 &&
+git merge -m "pre D8 merge" C3 &&

 echo "1
 2
 3 changed in C3, branch B
 echo "1
 2
 3 changed in C3, branch B


@@ -73,7 +73,7 @@ echo "1
 9" > file &&
 git commit -m D8 file'
 
 9" > file &&
 git commit -m D8 file'
 

-test_expect_success 'Criss-cross merge' 'git merge "final merge" A B'
+test_expect_success 'Criss-cross merge' 'git merge -m "final merge" B'

 
 cat > file-expect <<EOF
 1
 
 cat > file-expect <<EOF
 1

diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
index 1e266efffff6880929fdf2a35209511c5cefcba2..d00df0873135a8efcf0edb92cd397b92ab7d06f0 100755 (executable)
--- a/t/t9402-git-cvsserver-refs.sh
+++ b/t/t9402-git-cvsserver-refs.sh
@@ -496,7 +496,7 @@ test_expect_success 'check [cvswork3] diff' '
 '
 
 test_expect_success 'merge early [cvswork3] b3 with b1' '
 '
 
 test_expect_success 'merge early [cvswork3] b3 with b1' '

-       ( cd gitwork3 && git merge "message" HEAD b1 ) &&
+       ( cd gitwork3 && git merge -m "message" b1 ) &&

        git fetch gitwork3 b3:b3 &&
        git tag v3merged b3 &&
        git push --tags gitcvs.git b3:b3
        git fetch gitwork3 b3:b3 &&
        git tag v3merged b3 &&
        git push --tags gitcvs.git b3:b3