t5520: test work tree fast-forward when fetch updates head

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)) {
+               warning("old-style 'git merge <msg> HEAD <commit>' is deprecated.");
                strbuf_addstr(&merge_msg, argv[0]);
                head_arg = argv[1];
                argv += 2;