зеркало из https://github.com/microsoft/git.git
trace2:data: add subverb to reset command
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
e27dd8ae9f
Коммит
c18b6c1a2b
|
@ -341,6 +341,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
if (patch_mode) {
|
||||
if (reset_type != NONE)
|
||||
die(_("--patch is incompatible with --{hard,mixed,soft}"));
|
||||
trace2_cmd_mode("patch-interactive");
|
||||
return run_add_interactive(rev, "--patch=reset", &pathspec);
|
||||
}
|
||||
|
||||
|
@ -357,6 +358,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
if (reset_type == NONE)
|
||||
reset_type = MIXED; /* by default */
|
||||
|
||||
if (pathspec.nr)
|
||||
trace2_cmd_mode("path");
|
||||
else
|
||||
trace2_cmd_mode(reset_type_names[reset_type]);
|
||||
|
||||
if (reset_type != SOFT && (reset_type != MIXED || get_git_work_tree()))
|
||||
setup_work_tree();
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче