From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ted Pavlic Subject: [PATCH 1/4] completion: For consistency, changed "git rev-parse" to __gitdir calls. Date: Wed, 11 Feb 2009 13:54:36 -0500 Message-ID: <1234378479-29304-2-git-send-email-ted@tedpavlic.com> References: <7v63jgg7st.fsf@gitster.siamese.dyndns.org> <1234378479-29304-1-git-send-email-ted@tedpavlic.com> Cc: git@vger.kernel.org, gitster@pobox.com, Ted Pavlic To: spearce@spearce.org X-From: git-owner@vger.kernel.org Wed Feb 11 19:56:42 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LXKFx-0002sJ-RZ for gcvg-git-2@gmane.org; Wed, 11 Feb 2009 19:56:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756682AbZBKSyw (ORCPT ); Wed, 11 Feb 2009 13:54:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755891AbZBKSyv (ORCPT ); Wed, 11 Feb 2009 13:54:51 -0500 Received: from gallifrey.ece.ohio-state.edu ([164.107.167.66]:44556 "EHLO gallifrey.ece.ohio-state.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753980AbZBKSyv (ORCPT ); Wed, 11 Feb 2009 13:54:51 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by gallifrey.ece.ohio-state.edu (Postfix) with ESMTP id 27A2E80D8088; Wed, 11 Feb 2009 13:48:20 -0500 (EST) X-Virus-Scanned: amavisd-new at gallifrey.ece.ohio-state.edu Received: from gallifrey.ece.ohio-state.edu ([127.0.0.1]) by localhost (gallifrey.ece.ohio-state.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Tg6ar4hlgsr; Wed, 11 Feb 2009 13:48:20 -0500 (EST) Received: from localhost.localdomain (tedpc.ece.ohio-state.edu [164.107.164.122]) by gallifrey.ece.ohio-state.edu (Postfix) with ESMTP id 087FA80D808B; Wed, 11 Feb 2009 13:48:20 -0500 (EST) X-Mailer: git-send-email 1.6.1.2.390.gba743 In-Reply-To: <1234378479-29304-1-git-send-email-ted@tedpavlic.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Ted Pavlic Acked-by: Shawn O. Pearce --- contrib/completion/git-completion.bash | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f44f63c..6bbe09a 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -80,7 +80,7 @@ __gitdir () # returns text to add to bash PS1 prompt (includes branch name) __git_ps1 () { - local g="$(git rev-parse --git-dir 2>/dev/null)" + local g="$(__gitdir)" if [ -n "$g" ]; then local r local b @@ -1797,7 +1797,7 @@ _gitk () __git_has_doubledash && return local cur="${COMP_WORDS[COMP_CWORD]}" - local g="$(git rev-parse --git-dir 2>/dev/null)" + local g="$(__gitdir)" local merge="" if [ -f $g/MERGE_HEAD ]; then merge="--merge" -- 1.6.1.2.390.gba743