diff --git a/share/completions/git.fish b/share/completions/git.fish
index 46a75188c..007bc9e16 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -43,7 +43,8 @@ end
 function __fish_git_using_command
   set cmd (commandline -opc)
   if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
+    set -e cmd[1]
+    if [ (echo $argv) = (echo $cmd) ]
       return 0
     end
   end