about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <danielsh@apache.org>2020-01-12 22:29:27 +0000
committerDaniel Shahaf <danielsh@apache.org>2020-01-15 22:41:25 +0000
commit22c0fe02a53bedb03f6aef5d0e476bbadc655995 (patch)
tree33613c7887481b4fae49a9eff1a12699787cc5a9
parent819204346025aaaed205c9191ec7a1729cf146e3 (diff)
downloadzsh-22c0fe02a53bedb03f6aef5d0e476bbadc655995.tar.gz
zsh-22c0fe02a53bedb03f6aef5d0e476bbadc655995.tar.xz
zsh-22c0fe02a53bedb03f6aef5d0e476bbadc655995.zip
45288: _git: Complete bisect/new as well as bisect/bad.
Also, complete the bisect/old-$commithash ref names.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c97db5969..18d8e9ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-15  Daniel Shahaf  <danielsh@apache.org>
+
+	* 45288: Completion/Unix/Command/_git: Complete bisect/new as
+	well as bisect/bad.
+
 2020-01-06  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 45246: configure.ac: Make --disable-multibyte warn, since
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index be0c810cc..fa3d99f2f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6702,14 +6702,12 @@ __git_heads_local () {
   local f gitdir
   declare -a heads
 
-  heads=(${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname:short)"' refs/heads 2>/dev/null)"})
+  heads=(${(f)"$(_call_program headrefs git for-each-ref --format='"%(refname:short)"' refs/heads refs/bisect refs/stash 2>/dev/null)"})
   gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
   if __git_command_successful $pipestatus; then
     for f in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
       [[ -f $gitdir/$f ]] && heads+=$f
     done
-    [[ -f $gitdir/refs/stash ]] && heads+=stash
-    [[ -f $gitdir/refs/bisect/bad ]] && heads+=bisect/bad
   fi
 
   __git_describe_commit heads heads-local "local head" "$@"