PATCH: git completion - pass on --git-dir option

PATCH: git completion - pass on --git-dir option

[Oliver Kiddle]

Various aspects of git completion don't work if the option --git-dir is
used. This solves that by putting the value in $GIT_DIR.

Oliver

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 2178b82..c89ab56 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -7484,7 +7484,7 @@ _git() {
         ;;
       (option-or-argument)
         curcontext=${curcontext%:*:*}:git-$words[1]:
-
+	(( $+opt_args[--git-dir] )) && local -x GIT_DIR=$opt_args[--git-dir]
 	if ! _call_function ret _git-$words[1]; then
 	  if zstyle -T :completion:$curcontext: use-fallback; then
 	    _default && ret=0

Re: PATCH: git completion - pass on --git-dir option

[Daniel Shahaf]

Oliver Kiddle wrote on Fri, Sep 30, 2016 at 09:12:55 +0200:
> Various aspects of git completion don't work if the option --git-dir is
> used. This solves that by putting the value in $GIT_DIR.
> 
> +++ b/Completion/Unix/Command/_git
> @@ -7484,7 +7484,7 @@ _git() {
> +	(( $+opt_args[--git-dir] )) && local -x GIT_DIR=$opt_args[--git-dir]

Also for --work-tree/GIT_WORK_TREE?

There are other --option/ENVVAR pairs in git(1), but I don't know
whether it is important for them to get this treatment too.

Cheers,

Daniel

Re: PATCH: git completion - pass on --git-dir option

[Daniel Shahaf]

Daniel Shahaf wrote on Tue, Oct 04, 2016 at 17:26:23 +0000:
> Oliver Kiddle wrote on Fri, Sep 30, 2016 at 09:12:55 +0200:
> > Various aspects of git completion don't work if the option --git-dir is
> > used. This solves that by putting the value in $GIT_DIR.
> > 
> > +++ b/Completion/Unix/Command/_git
> > @@ -7484,7 +7484,7 @@ _git() {
> > +	(( $+opt_args[--git-dir] )) && local -x GIT_DIR=$opt_args[--git-dir]
> 
> Also for --work-tree/GIT_WORK_TREE?

This matters for diff-files.

> There are other --option/ENVVAR pairs in git(1), but I don't know
> whether it is important for them to get this treatment too.

-C would also be useful.  Given that it can be passed multiple times,
I think the best approach would be to define a local array in _git that
contains all the -C/--work-tree/--git-dir/--et-cetera options and their
arguments from the command-line, and pass it to various _call_program
invocations later in the file.

I don't plan to do this, though; I got quite enough on my plate right now.

Cheers,

Daniel