completion: list short refs from a remote given as a URL

e832f5c09680 (completion: avoid ls-remote in certain scenarios, 2013-05-28) turned a 'git ls-remote <remote>' query into a 'git for-each-ref refs/remotes/<remote>/' to improve responsiveness of remote refs completion by avoiding potential network communication. However, it inadvertently made impossible to complete short refs from a remote given as a URL, e.g. 'git fetch git://server.com/repo.git <TAB>', because there is, of course, no such thing as 'refs/remotes/git://server.com/repo.git'. Since the previous commit we tell apart configured remotes, i.e. those that can have a hierarchy under 'refs/remotes/', from others that don't, including remotes given as URL, so we know when we can't use the faster 'git for-each-ref'-based approach. Resurrect the old, pre-e832f5c09680 'git ls-remote'-based code for the latter case to support listing short refs from remotes given as a URL. The code is slightly updated from the original to - take into account the path to the repository given on the command line (if any), and - omit 'ORIG_HEAD' from the query, as 'git ls-remote' will never list it anyway. When the remote given to __git_refs() doesn't exist, then it will be handled by this resurrected 'git ls-remote' query. This code path doesn't list 'HEAD' unconditionally, which has the nice side effect of fixing two more expected test failures. 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 91b7ea81e87e9c0fd485edf39f0ad982d0350110
2 files changed +19 -6
contrib/completion/git-completion.bash
+16 -3
@@ -338,6 +338,7 @@ __git_tags ()
338 # Lists refs from the local (by default) or from a remote repository.
339 # It accepts 0, 1 or 2 arguments:
340 # 1: The remote to list refs from (optional; ignored, if set but empty).
341 +# Can be the name of a configured remote, a path, or a URL.
342 # 2: In addition to local refs, list unique branches from refs/remotes/ for
343 # 'git checkout's tracking DWIMery (optional; ignored, if set but empty).
344 __git_refs ()
@@ -410,9 +411,21 @@ __git_refs ()
411 done
412 ;;
413 *)
413 - echo "HEAD"
414 - git --git-dir="$dir" for-each-ref --format="%(refname:short)" \
415 - "refs/remotes/$remote/" 2>/dev/null | sed -e "s#^$remote/##"
414 + if [ "$list_refs_from" = remote ]; then
415 + echo "HEAD"
416 + git --git-dir="$dir" for-each-ref --format="%(refname:short)" \
417 + "refs/remotes/$remote/" 2>/dev/null | sed -e "s#^$remote/##"
418 + else
419 + git --git-dir="$dir" ls-remote "$remote" HEAD \
420 + "refs/tags/*" "refs/heads/*" "refs/remotes/*" 2>/dev/null |
421 + while read -r hash i; do
422 + case "$i" in
423 + *^{}) ;;
424 + refs/*) echo "${i#refs/*/}" ;;
425 + *) echo "$i" ;; # symbolic refs
426 + esac
427 + done
428 + fi
429 ;;
430 esac
431 }
t/t9902-completion.sh
+3 -3
@@ -540,7 +540,7 @@ test_expect_success '__git_refs - configured remote - remote name matches a dire
540 test_cmp expected "$actual"
541 '
542
543 -test_expect_failure '__git_refs - URL remote' '
543 +test_expect_success '__git_refs - URL remote' '
544 cat >expected <<-EOF &&
545 HEAD
546 branch-in-other
@@ -567,7 +567,7 @@ test_expect_success '__git_refs - URL remote - full refs' '
567 test_cmp expected "$actual"
568 '
569
570 -test_expect_failure '__git_refs - non-existing remote' '
570 +test_expect_success '__git_refs - non-existing remote' '
571 (
572 cur= &&
573 __git_refs non-existing >"$actual"
@@ -583,7 +583,7 @@ test_expect_success '__git_refs - non-existing remote - full refs' '
583 test_must_be_empty "$actual"
584 '
585
586 -test_expect_failure '__git_refs - non-existing URL remote' '
586 +test_expect_success '__git_refs - non-existing URL remote' '
587 (
588 cur= &&
589 __git_refs "file://$ROOT/non-existing" >"$actual"