kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/deprecate-old-syntax-from-merge' 

* jc/deprecate-old-syntax-from-merge:
  git-merge: a deprecation notice of the ancient command line syntax
maint
Junio C Hamano 2009-12-01 12:47:01 -08:00
parent 4a2775974a b81e00a965
commit 36a83f375b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-merge.c
View File

@ -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;
}