undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge: a deprecation notice of the ancient command line syntax

Browse Source 
The ancient form of git merge command used in the original sample script
has been copied from Linus and are still found everywhere, I think, and
people may still have it in their scripts, but on the other hand, it is so
unintuitive that even people reasonably familiar with git are surprised by
accidentally triggering the support to parse this ancient form.

Gently nudge people to upgrade their script to more recent and readable
style for eventual removal of the original syntax.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2009-11-30 16:23:50 -08:00
parent 78d553b7d7
commit b81e00a965
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

@ -789,6 +789,11 @@ static int suggest_conflicts(void)
return 1; 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) static struct commit *is_old_style_invocation(int argc, const char **argv)
{ {
struct commit *second_token = NULL; struct commit *second_token = NULL;
@ -802,6 +807,7 @@ static struct commit *is_old_style_invocation(int argc, const char **argv)
die("'%s' is not a commit", argv[1]); die("'%s' is not a commit", argv[1]);
if (hashcmp(second_token->object.sha1, head)) if (hashcmp(second_token->object.sha1, head))
return NULL; return NULL;
warning(deprecation_warning);
} }
return second_token; return second_token;
} }