diff options
| -rw-r--r-- | builtin-merge.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index fc7066e3c7..21045776b3 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -796,6 +796,11 @@ 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; @@ -809,6 +814,7 @@ 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; } |