From patchwork Wed Jan 30 09:48:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10788097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24077184E for ; Wed, 30 Jan 2019 09:49:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F65F2DF2D for ; Wed, 30 Jan 2019 09:49:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 031C92DFE9; Wed, 30 Jan 2019 09:49:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EF922DF2D for ; Wed, 30 Jan 2019 09:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730556AbfA3Jtu (ORCPT ); Wed, 30 Jan 2019 04:49:50 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:35963 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726548AbfA3Jtu (ORCPT ); Wed, 30 Jan 2019 04:49:50 -0500 Received: by mail-pl1-f194.google.com with SMTP id g9so10823760plo.3 for ; Wed, 30 Jan 2019 01:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b/KkG11mQUBgPJy2OC3LB0XG20naRV2b0Ced63MQfAE=; b=pmGlqc/wSgWNgyt2w4RrEGAwHJzdH6/KkDnD94NWNalIEZmgh4a3RuzUc+831wdQeo mKeafvMj/yJpQS6wYldvuyhaFQxgzj55Ggs2hIXF1HLebxPmNYoJ6NP2QFmCBYc+qILv 25IehiM3iiWQSwbcAe+E8Jzz3pbEvXOOCyN0ntYVeEDR0JzB2RPOE6kyBoQ30ixqBKbw bl2kiRChEz9+bgt6285ZGRgxWNjbi52RJFTnJRjrsesvQyafZWS0uGGjpyRn6vT/g87U c03B0N8oRCvld6hmAFufOsFfKE0kfw4955PwanqZOAvXWaydKXNN3gsqpnI2Bhtv4xIz ZVpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b/KkG11mQUBgPJy2OC3LB0XG20naRV2b0Ced63MQfAE=; b=piTiGtQibTDLv9c0aL5kH8dAm8cunAxjou/oNXlG0DfEQhFSSFH2ft8/elL4YFKwd2 BPkOqyTp+DQOcNINx9Ls1zg1yzwISAbQOmwNPhSuAAUe6lims7A2frjjpQPCWhXEnyFX slEB/qP7caJ2HRJSNFmyuPgiPTy4Z6f+h77lE7l7X7psZ70gafNGmf9Iz8oQ/5Ao7DV9 z0wAOWEZwMxbGMJeJh+MOe96C4Ae1HRoWp/M5z5Sw311KIaT4BRwb5pVqDcrjTjcoWs1 //GPvy5qB6E6nzDuGDg7t+YzLmcWLwKSbqxUMw8LaXw5g0LRsl30hlOkNriHAmCjYL9R Safg== X-Gm-Message-State: AJcUukdUjjaUO9HKASBxTI7cth2eA7x6F4fcAeY9On0cml6o7MLStQqQ w/v1ugXPFrAOeCZPPKzUxsfmqDcu X-Google-Smtp-Source: ALg8bN4+ZWWWUOfhjNe4Fwrp27GJcFHCjJ7W1ZZvdfAyH5ETcKDX+4f3xPXJDoDP5FinxHPenEgsGw== X-Received: by 2002:a17:902:7614:: with SMTP id k20mr30088075pll.285.1548841788709; Wed, 30 Jan 2019 01:49:48 -0800 (PST) Received: from ash ([115.72.21.220]) by smtp.gmail.com with ESMTPSA id 24sm7823453pfl.32.2019.01.30.01.49.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 01:49:48 -0800 (PST) Received: by ash (sSMTP sendmail emulation); Wed, 30 Jan 2019 16:49:44 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= Subject: [PATCH 15/19] switch: no implicit dwim, use --guess to dwim Date: Wed, 30 Jan 2019 16:48:27 +0700 Message-Id: <20190130094831.10420-16-pclouds@gmail.com> X-Mailer: git-send-email 2.20.1.682.gd5861c6d90 In-Reply-To: <20190130094831.10420-1-pclouds@gmail.com> References: <20190130094831.10420-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Similar to automatic detach, this behavior could be confusing because it can sometimes create a new branch without a user asking it to, especially when the user is still not aware about this feature. In the future, perhaps we could have a config key to disable these safety nets and let 'switch' do automatic detach or dwim again. But that will be opt-in after the user knows what is what. For now give a short option if you want to use it often. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 37 ++++++++++++++++++++-------------- builtin/checkout.c | 16 +++++++-------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 31c6cbef19..bcb7822c27 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -31,22 +31,13 @@ branch. . + If is not found but there does exist a tracking branch in -exactly one remote (call it ) with a matching name, treat as -equivalent to +exactly one remote (call it ) with a matching name and +--no-guess is not specified, treat as equivalent to + ------------ $ git checkout -b --track / ------------ + -If the branch exists in multiple remotes and one of them is named by -the `checkout.defaultRemote` configuration variable, we'll use that -one for the purposes of disambiguation, even if the `` isn't -unique across all remotes. Set it to -e.g. `checkout.defaultRemote=origin` to always checkout remote -branches from there if `` is ambiguous but exists on the -'origin' remote. See also `checkout.defaultRemote` in -linkgit:git-config[1]. -+ You could omit , in which case the command degenerates to "check out the current branch", which is a glorified no-op with rather expensive side-effects to show only the tracking information, @@ -182,6 +173,26 @@ explicitly give a name with `-b` in such a case. Do not set up "upstream" configuration, even if the branch.autoSetupMerge configuration variable is true. +--[no-]guess:: + If is not found but there does exist a tracking + branch in exactly one remote (call it ) with a + matching name, treat as equivalent to ++ +------------ +$ git checkout -b --track / +------------ ++ +If the branch exists in multiple remotes and one of them is named by +the `checkout.defaultRemote` configuration variable, we'll use that +one for the purposes of disambiguation, even if the `` isn't +unique across all remotes. Set it to +e.g. `checkout.defaultRemote=origin` to always checkout remote +branches from there if `` is ambiguous but exists on the +'origin' remote. See also `checkout.defaultRemote` in +linkgit:git-config[1]. ++ +Use `--no-guess` to disable this. + -l:: Create the new branch's reflog; see linkgit:git-branch[1] for details. @@ -284,10 +295,6 @@ Note that this option uses the no overlay mode by default (see also Just like linkgit:git-submodule[1], this will detach the submodules HEAD. ---no-guess:: - Do not attempt to create a branch if a remote tracking branch - of the same name exists. - --[no-]overlay:: In the default overlay mode, `git checkout` never removes files from the index or the working tree. When diff --git a/builtin/checkout.c b/builtin/checkout.c index 49c7ac211e..cdd07f6aba 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -52,7 +52,7 @@ struct checkout_opts { int show_progress; int count_checkout_paths; int overlay_mode; - int no_dwim_new_local_branch; + int dwim_new_local_branch; int accept_pathspec; int switch_branch_doing_nothing_is_ok; @@ -1388,8 +1388,6 @@ static struct option *add_common_switch_branch_options( OPT_BOOL_F(0, "overwrite-ignore", &opts->overwrite_ignore, N_("update ignored files (default)"), PARSE_OPT_NOCOMPLETE), - OPT_BOOL(0, "no-guess", &opts->no_dwim_new_local_branch, - N_("second guess 'git checkout '")), OPT_BOOL(0, "ignore-other-worktrees", &opts->ignore_other_worktrees, N_("do not check if another worktree is holding the given ref")), OPT_END() @@ -1426,7 +1424,6 @@ static int checkout_main(int argc, const char **argv, const char *prefix, { struct branch_info new_branch_info; int dwim_remotes_matched = 0; - int dwim_new_local_branch; memset(&new_branch_info, 0, sizeof(new_branch_info)); opts->overwrite_ignore = 1; @@ -1441,7 +1438,6 @@ static int checkout_main(int argc, const char **argv, const char *prefix, argc = parse_options(argc, argv, prefix, options, usagestr, PARSE_OPT_KEEP_DASHDASH); - dwim_new_local_branch = !opts->no_dwim_new_local_branch; if (opts->show_progress < 0) { if (opts->quiet) opts->show_progress = 0; @@ -1501,7 +1497,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix, struct object_id rev; int dwim_ok = !opts->patch_mode && - dwim_new_local_branch && + opts->dwim_new_local_branch && opts->track == BRANCH_TRACK_UNSPECIFIED && !opts->new_branch; int n = parse_branchname_arg(argc, argv, dwim_ok, @@ -1582,12 +1578,14 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"), N_("create/reset and checkout a branch")), OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")), + OPT_BOOL(0, "guess", &opts.dwim_new_local_branch, + N_("second guess 'git checkout ' (default)")), OPT_END() }; int ret; memset(&opts, 0, sizeof(opts)); - opts.no_dwim_new_local_branch = 0; + opts.dwim_new_local_branch = 1; opts.switch_branch_doing_nothing_is_ok = 1; opts.accept_pathspec = 1; opts.implicit_detach = 1; @@ -1612,12 +1610,14 @@ int cmd_switch(int argc, const char **argv, const char *prefix) N_("create and switch to a new branch")), OPT_STRING('C', "force-create", &opts.new_branch_force, N_("branch"), N_("create/reset and switch to a new branch")), + OPT_BOOL('g', "guess", &opts.dwim_new_local_branch, + N_("second guess 'git switch '")), OPT_END() }; int ret; memset(&opts, 0, sizeof(opts)); - opts.no_dwim_new_local_branch = 0; + opts.dwim_new_local_branch = 0; opts.accept_pathspec = 0; opts.switch_branch_doing_nothing_is_ok = 0; opts.implicit_detach = 0;