mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: drop 'git merge <message> HEAD <commit>' syntax

Browse Source 
And then if we and our users survived the previous "start warning if
the old syntax is used" patch for a few years, we could apply this
to actually drop the support for the ancient syntax.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2015-03-25 22:00:48 -07:00
parent d45366e8aa
commit b4391657ed
2 changed files with 10 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
builtin/merge.c
View File

@ -42,7 +42,6 @@ struct strategy {
static const char * const builtin_merge_usage[] = {
N_("git merge [options] [<commit>...]"),
N_("git merge [options] <msg> HEAD <commit>"),
N_("git merge --abort"),
NULL
};
@ -633,9 +632,10 @@ static void write_tree_trivial(unsigned char *sha1)
static int try_merge_strategy(const char *strategy, struct commit_list *common,
struct commit_list *remoteheads,
struct commit *head, const char *head_arg)
struct commit *head)
{
static struct lock_file lock;
const char *head_arg = "HEAD";
hold_locked_index(&lock, 1);
refresh_cache(REFRESH_QUIET);
@ -887,24 +887,6 @@ static int suggest_conflicts(int renormalizing)
return 1;
}
static struct commit *is_old_style_invocation(int argc, const char **argv,
const unsigned char *head)
{
struct commit *second_token = NULL;
if (argc > 2) {
unsigned char second_sha1[20];
if (get_sha1(argv[1], second_sha1))
return NULL;
second_token = lookup_commit_reference_gently(second_sha1, 0);
if (!second_token)
die(_("'%s' is not a commit"), argv[1]);
if (hashcmp(second_token->object.sha1, head))
return NULL;
}
return second_token;
}
static int evaluate_result(void)
{
int cnt = 0;
@ -1172,7 +1154,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
unsigned char head_sha1[20];
struct commit *head_commit;
struct strbuf buf = STRBUF_INIT;
const char *head_arg;
int flag, i, ret = 0, head_subsumed;
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
struct commit_list *common = NULL;
@ -1290,34 +1271,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
/*
* This could be traditional "merge <msg> HEAD <commit>..." and
* the way we can tell it is to see if the second token is HEAD,
* but some people might have misused the interface and used a
* commit-ish that is the same as HEAD there instead.
* Traditional format never would have "-m" so it is an
* additional safety measure to check for it.
* All the rest are the commits being merged; prepare
* the standard merge summary message to be appended
* to the given message.
*/
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;
argc -= 2;
remoteheads = collect_parents(head_commit, &head_subsumed,
argc, argv, NULL);
} else {
/* We are invoked directly as the first-class UI. */
head_arg = "HEAD";
/*
* All the rest are the commits being merged; prepare
* the standard merge summary message to be appended
* to the given message.
*/
remoteheads = collect_parents(head_commit, &head_subsumed,
argc, argv, &merge_msg);
}
remoteheads = collect_parents(head_commit, &head_subsumed,
argc, argv, &merge_msg);
if (!head_commit || !argc)
usage_with_options(builtin_merge_usage,
@ -1542,7 +1501,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
ret = try_merge_strategy(use_strategies[i]->name,
common, remoteheads,
head_commit, head_arg);
head_commit);
if (!option_commit && !ret) {
merge_was_ok = 1;
/*
@ -1612,7 +1571,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
printf(_("Using the %s to prepare resolving by hand.\n"),
best_strategy);
try_merge_strategy(best_strategy, common, remoteheads,
head_commit, head_arg);
head_commit);
}
if (squash)