Revert recent "git merge <msg> HEAD <commit>..." deprecation

This reverts commit c0ecb07048ce2123589a2f077d296e8cf29a9570 "git-pull.sh: Fix call to git-merge for new command format" and commit b81e00a965c62ca72a4b9db425ee173de147808d "git-merge: a deprecation notice of the ancient command line syntax". They caused a "git pull" (without any arguments, and without any local commits---only to update to the other side) to warn that commit log message is ignored because the merge resulted in a fast-forward. Another possible solution is to add an extra option to "git merge" so that "git pull" can tell it that the message given is not coming from the end user (the canned message is passed just in case the merge resulted in a non-ff and caused commit), but I think it is easier _not_ to deprecate the old syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 8, 2009 at 15:21 UTC 77c29b4acae2f129f71e4856b8d0518982802d83

2 files changed +3 -9

builtin-merge.c

-6

@@ -796,11 +796,6 @@ static int suggest_conflicts(void)

796 return 1;

797 }

798

799 -static const char deprecation_warning[] =

800 - "'git merge <msg> HEAD <commit>' is deprecated. Please update\n"

801 - "your script to use 'git merge -m <msg> <commit>' instead.\n"

802 - "In future versions of git, this syntax will be removed.";

803 -

799 static struct commit *is_old_style_invocation(int argc, const char **argv)

800 {

801 struct commit *second_token = NULL;

@@ -814,7 +809,6 @@ static struct commit *is_old_style_invocation(int argc, const char **argv)

809 die("'%s' is not a commit", argv[1]);

810 if (hashcmp(second_token->object.sha1, head))

811 return NULL;

817 - warning(deprecation_warning);

812 }

813 return second_token;

814 }

git-pull.sh

+3 -3

@@ -216,7 +216,7 @@ fi

216

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

218 test true = "$rebase" &&

219 - exec git rebase $diffstat $strategy_args --onto $merge_head \

219 + exec git-rebase $diffstat $strategy_args --onto $merge_head \

220 ${oldremoteref:-$merge_head}

221 -exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \

222 - -m "$merge_name" $merge_head

221 +exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \

222 + "$merge_name" HEAD $merge_head $verbosity