From: Ted Pavlic <ted@tedpavlic.com>
To: spearce@spearce.org
Cc: git@vger.kernel.org, gitster@pobox.com, Ted Pavlic <ted@tedpavlic.com>
Subject: [PATCH 1/4] completion: For consistency, changed "git rev-parse" to __gitdir calls.
Date: Wed, 11 Feb 2009 13:54:36 -0500 [thread overview]
Message-ID: <1234378479-29304-2-git-send-email-ted@tedpavlic.com> (raw)
In-Reply-To: <1234378479-29304-1-git-send-email-ted@tedpavlic.com>
Signed-off-by: Ted Pavlic <ted@tedpavlic.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
---
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
next prev parent reply other threads:[~2009-02-11 18:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 18:03 [PATCH 0/4] completion: Fixes and better non-work-tree support Ted Pavlic
2009-02-11 18:03 ` [PATCH 1/4] completion: For consistency, changed "git rev-parse" to __gitdir calls Ted Pavlic
2009-02-11 18:03 ` [PATCH 2/4] completion: Use consistent if [...] convention. No test Ted Pavlic
2009-02-11 18:03 ` [PATCH 3/4] completion: Better __git_ps1 support when not in working directory Ted Pavlic
2009-02-11 18:03 ` [PATCH 4/4] completion: More fixes to prevent unbound variable errors Ted Pavlic
2009-02-11 18:09 ` Shawn O. Pearce
2009-02-11 18:09 ` [PATCH 3/4] completion: Better __git_ps1 support when not in working directory Shawn O. Pearce
2009-02-11 18:07 ` [PATCH 2/4] completion: Use consistent if [...] convention. No test Shawn O. Pearce
2009-02-11 18:26 ` Junio C Hamano
2009-02-11 18:35 ` Shawn O. Pearce
2009-02-11 18:14 ` Junio C Hamano
2009-02-11 18:43 ` Ted Pavlic
2009-02-11 22:25 ` Jeff King
2009-02-11 18:54 ` [PATCH 0/4] completion fixes: Acks, whitespace, and r="" Ted Pavlic
2009-02-11 18:54 ` Ted Pavlic [this message]
2009-02-11 18:54 ` [PATCH 2/4] completion: Use consistent if [...] convention. No test Ted Pavlic
2009-02-11 18:54 ` [PATCH 3/4] completion: Better __git_ps1 support when not in working directory Ted Pavlic
2009-02-11 18:54 ` [PATCH 4/4] completion: More fixes to prevent unbound variable errors Ted Pavlic
2009-02-20 17:01 ` [PATCH 0/4] completion fixes: Acks, whitespace, and r="" Ted Pavlic
2009-02-20 17:08 ` Thomas Rast
2009-02-20 17:18 ` Ted Pavlic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1234378479-29304-2-git-send-email-ted@tedpavlic.com \
--to=ted@tedpavlic.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).