mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
git checkout --no-guess
Porcelains may want to make sure their calls to "git checkout" will reliably fail regardless of the presense of random remote tracking branches by the new DWIMmery introduced. Luckily all existing in-tree callers have extra checks to make sure they feed local branch name when they want to switch, or they explicitly ask to detach HEAD at the given commit, so there is no need to add this option for them. As this is strictly script-only option, do not even bother to document it, and do bother to hide it from "git checkout -h". Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
70c9ac2f19
commit
46148dd7ea
|
@ -616,6 +616,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||||
struct tree *source_tree = NULL;
|
struct tree *source_tree = NULL;
|
||||||
char *conflict_style = NULL;
|
char *conflict_style = NULL;
|
||||||
int patch_mode = 0;
|
int patch_mode = 0;
|
||||||
|
int dwim_new_local_branch = 1;
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
OPT__QUIET(&opts.quiet),
|
OPT__QUIET(&opts.quiet),
|
||||||
OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
|
OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
|
||||||
|
@ -631,6 +632,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||||
OPT_STRING(0, "conflict", &conflict_style, "style",
|
OPT_STRING(0, "conflict", &conflict_style, "style",
|
||||||
"conflict style (merge or diff3)"),
|
"conflict style (merge or diff3)"),
|
||||||
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
|
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
|
||||||
|
{ OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL,
|
||||||
|
"second guess 'git checkout no-such-branch'",
|
||||||
|
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
|
||||||
OPT_END(),
|
OPT_END(),
|
||||||
};
|
};
|
||||||
int has_dash_dash;
|
int has_dash_dash;
|
||||||
|
@ -715,6 +719,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||||
if (has_dash_dash) /* case (1) */
|
if (has_dash_dash) /* case (1) */
|
||||||
die("invalid reference: %s", arg);
|
die("invalid reference: %s", arg);
|
||||||
if (!patch_mode &&
|
if (!patch_mode &&
|
||||||
|
dwim_new_local_branch &&
|
||||||
opts.track == BRANCH_TRACK_UNSPECIFIED &&
|
opts.track == BRANCH_TRACK_UNSPECIFIED &&
|
||||||
!opts.new_branch &&
|
!opts.new_branch &&
|
||||||
!check_filename(NULL, arg) &&
|
!check_filename(NULL, arg) &&
|
||||||
|
|
Loading…
Reference in a new issue