[v2,27/29] completion: bash: cleanup cygwin check

Message ID	20201025031343.346913-28-felipe.contreras@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=tbmj=EA=vger.kernel.org=git-owner@kernel.org> From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v2 27/29] completion: bash: cleanup cygwin check Date: Sat, 24 Oct 2020 22:13:41 -0500 Message-Id: <20201025031343.346913-28-felipe.contreras@gmail.com> In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com> References: <20201025031343.346913-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [v2,02/29] completion: zsh: fix name due to broken autoloading [v2,03/29] completion: zsh: fix bash script extension [v2,04/29] completion: zsh: reorganize install instructions [v2,05/29] completion: zsh: fix for directories with spaces [v2,06/29] completion: zsh: update slave script locations [v2,07/29] completion: prompt: fix color for Zsh [v2,08/29] completion: zsh: fix for command aliasing [v2,09/29] completion: bash: synchronize zsh wrapper [v2,10/29] completion: bash: remove zsh wrapper [v2,11/29] completion: zsh: fix completion for --no-.. options [v2,12/29] completion: fix conflict with bashcomp [v2,13/29] completion: zsh: add missing direct_append [v2,14/29] completion: zsh: fix splitting of words [v2,15/29] completion: zsh: simplify compadd functions [v2,16/29] completion: zsh: simplify direct compadd [v2,17/29] completion: zsh: trivial cleanup [v2,18/29] completion: zsh: simplify nl_append [v2,19/29] completion: zsh: simplify file_direct [v2,20/29] completion: zsh: shuffle functions around [v2,21/29] completion: zsh: refactor command completion [v2,22/29] completion: zsh: improve command tags [v2,23/29] completion: zsh: add alias descriptions [v2,24/29] completion: zsh: trivial simplification [v2,25/29] completion: zsh: add simple version check [v2,26/29] completion: bash: trivial cleanup [v2,27/29] completion: bash: cleanup cygwin check [v2,28/29] completion: bash: remove old compat wrappers [v2,29/29] Update copyright notices

Message ID

20201025031343.346913-28-felipe.contreras@gmail.com (mailing list archive)

State

New, archived

Headers

From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
 =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>,
 Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 27/29] completion: bash: cleanup cygwin check
Date: Sat, 24 Oct 2020 22:13:41 -0500
Message-Id: <20201025031343.346913-28-felipe.contreras@gmail.com>
In-Reply-To: <20201025031343.346913-1-felipe.contreras@gmail.com>
References: <20201025031343.346913-1-felipe.contreras@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Felipe Contreras Oct. 25, 2020, 3:13 a.m. UTC

Avoid Yoda conditions, and use $OSTYPE.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 68e0acb232..ac1835cb30 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3500,6 +3500,6 @@  __git_complete gitk __gitk_main
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-__git_complete git.exe __git_main
+if [ "$OSTYPE" = cygwin ]; then
+	__git_complete git.exe __git_main
 fi

[v2,27/29] completion: bash: cleanup cygwin check

Commit Message

Patch