Re: Weird message when pulling git version 1.6.6.rc1.39.g9a42

[Junio C Hamano <gitster@pobox.com>]

Alejandro Riveira <ariveira@gmail.com> writes:

> $ git pull
> remote: Counting objects: 9, done.
> remote: Compressing objects: 100% (5/5), done.
> remote: Total 5 (delta 4), reused 0 (delta 0)
> Unpacking objects: 100% (5/5), done.
> From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
>    6035ccd..a252e74  master     -> origin/master
> Updating 6035ccd..a252e74
> Fast-forward (no commit created; -m option ignored) # what is this ??
>  net/sctp/sysctl.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

Thanks for reporting.

Warning about a message that the end user didn't give the command is
clearly wrong.  I guess we would want to revert c0ecb07 (git-pull.sh: Fix
call to git-merge for new command format, 2009-12-01), and b81e00a
(git-merge: a deprecation notice of the ancient command line syntax,
2009-11-30).

Reverting them will still keep 76bf488 (Do not misidentify "git merge foo
HEAD" as an old-style invocation, 2009-12-02) that resulted in the change
we are reverting here, so we are still ahead ;-)

  http://thread.gmane.org/gmane.comp.version-control.git/134103/focus=134145

-- >8 --
Subject: [PATCH] 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>
---
 builtin-merge.c |    6 ------
 git-pull.sh     |    6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/builtin-merge.c b/builtin-merge.c
index 56a1bb6..f1c84d7 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -796,11 +796,6 @@ static int suggest_conflicts(void)
 	return 1;
 }
 
-static const char deprecation_warning[] =
-	"'git merge <msg> HEAD <commit>' is deprecated. Please update\n"
-	"your script to use 'git merge -m <msg> <commit>' instead.\n"
-	"In future versions of git, this syntax will be removed.";
-
 static struct commit *is_old_style_invocation(int argc, const char **argv)
 {
 	struct commit *second_token = NULL;
@@ -814,7 +809,6 @@ static struct commit *is_old_style_invocation(int argc, const char **argv)
 			die("'%s' is not a commit", argv[1]);
 		if (hashcmp(second_token->object.sha1, head))
 			return NULL;
-		warning(deprecation_warning);
 	}
 	return second_token;
 }
diff --git a/git-pull.sh b/git-pull.sh
index 502af1a..bfeb4a0 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -216,7 +216,7 @@ fi
 
 merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 test true = "$rebase" &&
-	exec git rebase $diffstat $strategy_args --onto $merge_head \
+	exec git-rebase $diffstat $strategy_args --onto $merge_head \
 	${oldremoteref:-$merge_head}
-exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
-	-m "$merge_name" $merge_head
+exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
+	"$merge_name" HEAD $merge_head $verbosity
-- 
1.6.6.rc1.42.gf9ad7