Code

completion: For consistency, change "git rev-parse" to __gitdir calls
authorTed Pavlic <ted@tedpavlic.com>
Wed, 11 Feb 2009 18:03:23 +0000 (13:03 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2009 19:09:16 +0000 (11:09 -0800)
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>
contrib/completion/git-completion.bash

index f44f63cfebf68f773dd96bd82317801d468f6cff..6bbe09ab9a58b50114664a44a0f47036a9280e6a 100755 (executable)
@@ -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"