[PATCH 09/21] completion: respect 'git --git-dir=<path>' when listing remote refs
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Feb 25, 2016, 22:50 UTC
- Message-ID
- <1456440650-32623-10-git-send-email-szeder@ira.uka.de>
- In-Reply-To
- <1456440650-32623-1-git-send-email-szeder@ira.uka.de>
In __git_refs() the git commands listing refs, both short and full, from a given remote repository are run without giving them the path to the git repository which might have been specified on the command line via 'git --git-dir=<path>'. This is bad, those git commands should access the 'refs/remotes/<remote>/' hierarchy or the remote and credentials configuration in that specified repository.
Use the __gitdir() helper only to find the path to the .git directory and pass the resulting path to the 'git ls-remote' and 'for-each-ref' executions that list remote refs.
Don't use __gitdir() to check that the given remote is on the file system: basically it performs only a single if statement for us at the considerable cost of fork()ing a subshell for a command substitution. We are better off to perform all the necessary checks of the remote in __git_refs().
Though __git_refs() was the last remaining callsite that passed a remote to __gitdir(), don't delete __gitdir()'s remote-handling part yet, just in case some users' custom completion scriptlets depend on it.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> --- contrib/completion/git-completion.bash | 22 +++++++++++++++++----- t/t9902-completion.sh | 4 ++-- 2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 59dffe7f39c2..adc968acea9d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -342,9 +342,21 @@ __git_tags () # 'git checkout's tracking DWIMery (optional; ignored, if set but empty). __git_refs () { - local i hash dir="$(__gitdir "${1-}")" track="${2-}" + local i hash dir="$(__gitdir)" track="${2-}" + local from_local=y remote="${1-}" local format refs - if [ -d "$dir" ]; then + + if [ -n "$remote" ]; then + if [ -d "$remote/.git" ]; then + dir="$remote/.git" + elif [ -d "$remote" ]; then + dir="$remote" + else + from_local=n + fi + fi + + if [ "$from_local" = y ] && [ -d "$dir" ]; then case "$cur" in refs|refs/*) format="refname" @@ -380,7 +392,7 @@ __git_refs () fi case "$cur" in refs|refs/*) - git ls-remote "$dir" "$cur*" 2>/dev/null | \ + git --git-dir="$dir" ls-remote "$remote" "$cur*" 2>/dev/null | \ while read -r hash i; do case "$i" in *^{}) ;; @@ -390,8 +402,8 @@ __git_refs () ;; *) echo "HEAD" - git for-each-ref --format="%(refname:short)" -- \ - "refs/remotes/$dir/" 2>/dev/null | sed -e "s#^$dir/##" + git --git-dir="$dir" for-each-ref --format="%(refname:short)" -- \ + "refs/remotes/$remote/" 2>/dev/null | sed -e "s#^$remote/##" ;; esac } diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 809856110235..f9993d2c005a 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -490,7 +490,7 @@ test_expect_success '__git_refs - configured remote - full refs' ' test_cmp expected "$actual" ' -test_expect_failure '__git_refs - configured remote - repo given on the command line' ' +test_expect_success '__git_refs - configured remote - repo given on the command line' ' cat >expected <<-EOF && HEAD branch @@ -505,7 +505,7 @@ test_expect_failure '__git_refs - configured remote - repo given on the command test_cmp expected "$actual" ' -test_expect_failure '__git_refs - configured remote - full refs - repo given on the command line' ' +test_expect_success '__git_refs - configured remote - full refs - repo given on the command line' ' cat >expected <<-EOF && refs/heads/branch refs/heads/master
-- 2.7.2.410.g92cb358