From patchwork Sat Apr 25 02:20:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 11509617 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D78815AB for ; Sat, 25 Apr 2020 02:21:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D9D520857 for ; Sat, 25 Apr 2020 02:21:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726201AbgDYCVE (ORCPT ); Fri, 24 Apr 2020 22:21:04 -0400 Received: from mga12.intel.com ([192.55.52.136]:47710 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726147AbgDYCUz (ORCPT ); Fri, 24 Apr 2020 22:20:55 -0400 IronPort-SDR: Fc64hngB+75q7ZCNpsEhepqueYbabjFnbT+T/eUJ3rWqcqUw+KO59r/WiC8v2ZJ8bRCpzaLgxe w10U9NazzDkw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2020 19:20:53 -0700 IronPort-SDR: Y6Yi3Xr9q57IqYAX9ZgWL64u04XYb1KkVYrlRIxg4vrPijhXlQZe3c3f9Rxr6P8XIbPjJqrMoT h5kKYM+Kj+lA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,314,1583222400"; d="scan'208";a="281056783" Received: from jekeller-desk.amr.corp.intel.com ([10.166.241.33]) by fmsmga004.fm.intel.com with ESMTP; 24 Apr 2020 19:20:53 -0700 From: Jacob Keller To: git@vger.kernel.org Cc: Jonathan Nieder , Jacob Keller Subject: [PATCH 06/11] completion: rename --track option of __git_complete_refs Date: Fri, 24 Apr 2020 19:20:40 -0700 Message-Id: <20200425022045.1089291-8-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200425022045.1089291-1-jacob.e.keller@intel.com> References: <20200425022045.1089291-1-jacob.e.keller@intel.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jacob Keller The __git_complete_refs uses the "--track" option to specify when to enable listing of unique remote branches which could be used by the DWIMery of git checkout and git switch. This is confusing, because both git checkout and git switch have a --track option. This makes looking at the completion code for these two functions confusing. Rename this parameter to --dwim. Because it is plausible for users to have developed their own completions which rely on __git_complete_ref, keep --track as a synonym for --dwim, but do not use it in our own completion code. This reduces the confusion when seeing --track in the _git_switch() and _git_checkout() completion functions. Signed-off-by: Jacob Keller --- contrib/completion/git-completion.bash | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 08d3406cf3e4..02dc1203559c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -749,7 +749,7 @@ __git_refs () # Usage: __git_complete_refs [