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