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

gitster · gitster · commit 36a83f375bc2 · 2009-12-01T12:47:01.000-08:00
* jc/deprecate-old-syntax-from-merge:
  git-merge: a deprecation notice of the ancient command line syntax
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,11 @@ static int suggest_conflicts(void)`
`796`	`796`	`return 1;`
`797`	`797`	`}`
`798`	`798`
	`799`	`+static const char deprecation_warning[] =`
	`800`	`+ "'git merge <msg> HEAD <commit>' is deprecated. Please update\n"`
	`801`	`+ "your script to use 'git merge -m <msg> <commit>' instead.\n"`
	`802`	`+ "In future versions of git, this syntax will be removed.";`
	`803`	`+`
`799`	`804`	`static struct commit is_old_style_invocation(int argc, const char *argv)`
`800`	`805`	`{`
`801`	`806`	`struct commit *second_token = NULL;`
`@@ -809,6 +814,7 @@ static struct commit is_old_style_invocation(int argc, const char *argv)`
`809`	`814`	`die("'%s' is not a commit", argv[1]);`
`810`	`815`	`if (hashcmp(second_token->object.sha1, head))`
`811`	`816`	`return NULL;`
	`817`	`+ warning(deprecation_warning);`
`812`	`818`	`}`
`813`	`819`	`return second_token;`
`814`	`820`	`}`