From patchwork Fri Feb 8 09:04:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10802539 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 75E0F17F0 for ; Fri, 8 Feb 2019 09:06:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 629D92D89D for ; Fri, 8 Feb 2019 09:06:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 570052DDB2; Fri, 8 Feb 2019 09:06:05 +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 2E6282D89D for ; Fri, 8 Feb 2019 09:06:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727528AbfBHJGD (ORCPT ); Fri, 8 Feb 2019 04:06:03 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35409 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727273AbfBHJGC (ORCPT ); Fri, 8 Feb 2019 04:06:02 -0500 Received: by mail-pf1-f196.google.com with SMTP id z9so1393575pfi.2 for ; Fri, 08 Feb 2019 01:06:02 -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=uiwH6ChY8DaDH9/oTCrsEMxtBwi3+v3tCgHe6diYWzM=; b=jGtFelgdGOZhpvA6AthCBk2EQzYoSiALFMwgpJP/BkHM8g0b+DehoiHPNmeouOsVJY 2VTUIYkeekJQPh2LXq1pCHTlP/t8iOcq7Kmst34b1lwo/NTxdkJEdALe2Ke4FukRjhbq zDSEnofdR7qNb/LxQ0pYS0nzJGPoL6qMh3GWA/Nor0lxTk/t1QZaNLBGIqURwZET9Wkz cHQ4C6iZqOeTnvojcoOzcJLxvHGYy2HFmMtLgndkZ0ef5jeYhuWYjuulZMXYt1qnNDeH Qd+csA4OSg5uaTS2Huh2X4Rq6tJMW+izXFSDhWquKErQ3wn+W/iAUIDa+eXDI0sz0Xqm An6w== 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=uiwH6ChY8DaDH9/oTCrsEMxtBwi3+v3tCgHe6diYWzM=; b=NeTGFo5SMy17sgF+tZwYE2RcIj28bGEeqlGcZdM8nrhpS+uB+j1RIzHYCkfn2VIKy6 4o/4gi6wsgkdGUvgnoJv43sWvT2fhWgYkj7xjkznL3ySyCSB1YsHxkpfwe+mow7neSZM +bE/q6h2zhG4pZlCofqTf24n6LFNt6ZVT9rLzsYh33N127n8TAjNh84XZZ1EPwBPbwdb rFgyI/nz6eUHRoScKtUmwIQ3CWa1NGxkFb5hbn4yNB8Yg9cTuml9dV3FJtbSmOsvS1/K yG195gqHnpCgebtulfMAxkijGJGzjngbpq81Pxqim9V6cGD/wsZLJuomElUopI9+ROhV y/zA== X-Gm-Message-State: AHQUAuYs+khjRVytZ8VxDSaJBsw4Guhb2WRnAhB1MPfLXK0KdmjgfcET nUhuEKMUOxliNiOdPBZtsobvunYW X-Google-Smtp-Source: AHgI3IaBd6rYQ7CyHJDSwTyiTkQF7bS9QmHTgkabglAKoDCLTtKSs1PriXAivI+jKxnSRFdO+X2YDg== X-Received: by 2002:a65:6151:: with SMTP id o17mr2077427pgv.285.1549616761997; Fri, 08 Feb 2019 01:06:01 -0800 (PST) Received: from ash ([115.72.21.220]) by smtp.gmail.com with ESMTPSA id 4sm1930420pfq.10.2019.02.08.01.05.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 01:06:01 -0800 (PST) Received: by ash (sSMTP sendmail emulation); Fri, 08 Feb 2019 16:05:56 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, Eric Sunshine , =?utf-8?q?SZEDER_G=C3=A1bor?= , Junio C Hamano Subject: [PATCH v2 18/19] completion: support switch Date: Fri, 8 Feb 2019 16:04:00 +0700 Message-Id: <20190208090401.14793-19-pclouds@gmail.com> X-Mailer: git-send-email 2.20.1.682.gd5861c6d90 In-Reply-To: <20190208090401.14793-1-pclouds@gmail.com> References: <20190130094831.10420-1-pclouds@gmail.com> <20190208090401.14793-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 Completion support for --guess could be made better. If no --detach is given, we should only provide a list of refs/heads/* and dwim ones, not the entire ref space. But I still can't penetrate that __git_refs() function yet. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 499e56f83d..891abb72d7 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2126,6 +2126,32 @@ _git_status () __git_complete_index_file "$complete_opt" } +_git_switch () +{ + case "$cur" in + --conflict=*) + __gitcomp "diff3 merge" "" "${cur##--conflict=}" + ;; + --*) + __gitcomp_builtin switch + ;; + *) + # check if ---guess was specified to enable DWIM mode + local track_opt= only_local_ref=n + if [ -n "$(__git_find_on_cmdline "-g --guess")" ]; then + track_opt='--track' + elif [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then + only_local_ref=y + fi + if [ $only_local_ref = y ]; then + __gitcomp_direct "$(__git_heads "" "$cur" " ")" + else + __git_complete_refs $track_opt + fi + ;; + esac +} + __git_config_get_set_variables () { local prevword word config_file= c=$cword