Re: [PATCH 1/3] completion: For consistency, changed "git rev-parse" to __gitdir calls.
Ted Pavlic <ted@tedpavlic.com> wrote:
> Signed-off-by: Ted Pavlic <ted@tedpavlic.com>
> ---
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Show 28 quoted lines
> 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
> --
Shawn.
Shawn O. Pearce <spearce@spearce.org>