diff options
author | SZEDER Gábor <szeder.dev@gmail.com> | 2017-02-03 03:48:20 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 22:18:40 -0800 |
commit | 91b7ea81e87e9c0fd485edf39f0ad982d0350110 (patch) | |
tree | d41ac9659f6091576ae8107308e0a6e26cefe218 /t/t9902-completion.sh | |
parent | 62a1b732160c363a84be310f801b5dec59196b9c (diff) | |
download | git-91b7ea81e87e9c0fd485edf39f0ad982d0350110.tar.gz |
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>
Diffstat (limited to 't/t9902-completion.sh')
-rwxr-xr-x | t/t9902-completion.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 5b4defaa5c..500505dca1 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -540,7 +540,7 @@ test_expect_success '__git_refs - configured remote - remote name matches a dire test_cmp expected "$actual" ' -test_expect_failure '__git_refs - URL remote' ' +test_expect_success '__git_refs - URL remote' ' cat >expected <<-EOF && HEAD branch-in-other @@ -567,7 +567,7 @@ test_expect_success '__git_refs - URL remote - full refs' ' test_cmp expected "$actual" ' -test_expect_failure '__git_refs - non-existing remote' ' +test_expect_success '__git_refs - non-existing remote' ' ( cur= && __git_refs non-existing >"$actual" @@ -583,7 +583,7 @@ test_expect_success '__git_refs - non-existing remote - full refs' ' test_must_be_empty "$actual" ' -test_expect_failure '__git_refs - non-existing URL remote' ' +test_expect_success '__git_refs - non-existing URL remote' ' ( cur= && __git_refs "file://$ROOT/non-existing" >"$actual" |