completion: respect 'git --git-dir=<path>' when listing remote refs

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. While modifying that 'for-each-ref' line, remove the superfluous disambiguating doubledash. 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.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Feb 3, 2017 at 03:48 UTC 5c12f642df48a0ddee24554fbd2067c4958273d8
2 files changed +19 -7
contrib/completion/git-completion.bash
+17 -5
@@ -342,9 +342,21 @@ __git_tags ()
342 # 'git checkout's tracking DWIMery (optional; ignored, if set but empty).
343 __git_refs ()
344 {
345 - local i hash dir="$(__gitdir "${1-}")" track="${2-}"
345 + local i hash dir="$(__gitdir)" track="${2-}"
346 + local list_refs_from=path remote="${1-}"
347 local format refs pfx
347 - if [ -d "$dir" ]; then
348 +
349 + if [ -n "$remote" ]; then
350 + if [ -d "$remote/.git" ]; then
351 + dir="$remote/.git"
352 + elif [ -d "$remote" ]; then
353 + dir="$remote"
354 + else
355 + list_refs_from=remote
356 + fi
357 + fi
358 +
359 + if [ "$list_refs_from" = path ] && [ -d "$dir" ]; then
360 case "$cur" in
361 refs|refs/*)
362 format="refname"
@@ -381,7 +393,7 @@ __git_refs ()
393 fi
394 case "$cur" in
395 refs|refs/*)
384 - git ls-remote "$dir" "$cur*" 2>/dev/null | \
396 + git --git-dir="$dir" ls-remote "$remote" "$cur*" 2>/dev/null | \
397 while read -r hash i; do
398 case "$i" in
399 *^{}) ;;
@@ -391,8 +403,8 @@ __git_refs ()
403 ;;
404 *)
405 echo "HEAD"
394 - git for-each-ref --format="%(refname:short)" -- \
395 - "refs/remotes/$dir/" 2>/dev/null | sed -e "s#^$dir/##"
406 + git --git-dir="$dir" for-each-ref --format="%(refname:short)" \
407 + "refs/remotes/$remote/" 2>/dev/null | sed -e "s#^$remote/##"
408 ;;
409 esac
410 }
t/t9902-completion.sh
+2 -2
@@ -486,7 +486,7 @@ test_expect_success '__git_refs - configured remote - full refs' '
486 test_cmp expected "$actual"
487 '
488
489 -test_expect_failure '__git_refs - configured remote - repo given on the command line' '
489 +test_expect_success '__git_refs - configured remote - repo given on the command line' '
490 cat >expected <<-EOF &&
491 HEAD
492 branch-in-other
@@ -501,7 +501,7 @@ test_expect_failure '__git_refs - configured remote - repo given on the command
501 test_cmp expected "$actual"
502 '
503
504 -test_expect_failure '__git_refs - configured remote - full refs - repo given on the command line' '
504 +test_expect_success '__git_refs - configured remote - full refs - repo given on the command line' '
505 cat >expected <<-EOF &&
506 refs/heads/branch-in-other
507 refs/heads/master-in-other