зеркало из https://github.com/microsoft/git.git
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
* ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly.
This commit is contained in:
Коммит
99292c638a
|
@ -106,8 +106,8 @@ static struct strategy *get_strategy(const char *name)
|
|||
found = 1;
|
||||
if (!found)
|
||||
add_cmdname(¬_strategies, ent->name, ent->len);
|
||||
exclude_cmds(&main_cmds, ¬_strategies);
|
||||
}
|
||||
exclude_cmds(&main_cmds, ¬_strategies);
|
||||
}
|
||||
if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
|
||||
fprintf(stderr, "Could not find merge strategy '%s'.\n", name);
|
||||
|
|
Загрузка…
Ссылка в новой задаче