summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTed Pavlic <ted@tedpavlic.com>2009-02-11 18:03:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-11 19:09:16 (GMT)
commitfa26a401bed5967d6118ac430c5c5f4707c54386 (patch)
tree93e784c1a3ac456143015f86ee96e7e6bea26b22 /contrib
parent1b53a076fc3e3dc58e67971df18df0ce973a3ff9 (diff)
downloadgit-fa26a401bed5967d6118ac430c5c5f4707c54386.zip
git-fa26a401bed5967d6118ac430c5c5f4707c54386.tar.gz
git-fa26a401bed5967d6118ac430c5c5f4707c54386.tar.bz2
completion: For consistency, change "git rev-parse" to __gitdir calls
Signed-off-by: Ted Pavlic <ted@tedpavlic.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash4
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"