diff options
| author |  SZEDER Gábor <szeder.dev@gmail.com> | 2017-02-03 03:48:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-02-03 22:18:40 -0800 |
| commit | 5c12f642df48a0ddee24554fbd2067c4958273d8 (patch) | |
| tree | 449d88b4ad568b4f3e801b1473f64acb8ee735ba /t | |
| parent | completion: fix most spots not respecting 'git --git-dir=<path>' (diff) | |
| download | tgif-5c12f642df48a0ddee24554fbd2067c4958273d8.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9902-completion.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7667baabff..6e64cd6bac 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -486,7 +486,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-in-other @@ -501,7 +501,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-in-other refs/heads/master-in-other |