tidy up some git stuff

6 files changed, 8 insertions, 5 deletions

diff --git a/fish/.config/fish/completions/fisher.fish b/fish/.config/fish/completions/fisher.fish
deleted file mode 100644
index 61a3810..0000000
--- a/fish/.config/fish/completions/fisher.fish
+++ /dev/null
@@ -1 +0,0 @@
-fisher --complete
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index d379934..43f34bf 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -2,6 +2,7 @@
 # VERSION: 3.0
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_init_3_x:\x1d
 SETUVAR fish_color_autosuggestion:555\x1ebrblack
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:\x2d\x2dbold
diff --git a/fish/.config/fish/functions/g.fish b/fish/.config/fish/functions/g.fish
index 05d6434..3d97608 100644
--- a/fish/.config/fish/functions/g.fish
+++ b/fish/.config/fish/functions/g.fish
@@ -1,3 +1,5 @@
+complete -c g -w git
+
 function g
     if count $argv > /dev/null
         git $argv
diff --git a/fish/.config/fish/functions/is_git.fish b/fish/.config/fish/functions/is_git.fish
index 74bd02d..a0f3091 100644
--- a/fish/.config/fish/functions/is_git.fish
+++ b/fish/.config/fish/functions/is_git.fish
@@ -1,4 +1,5 @@
 function is_git
     git rev-parse --verify HEAD >/dev/null ^&1
+    # keeping ^ for now for v2 backwards compatibility
 end
 
diff --git a/fish/.config/fish/functions/is_git_dirty.fish b/fish/.config/fish/functions/is_git_dirty.fish
index b497d22..e24045f 100644
--- a/fish/.config/fish/functions/is_git_dirty.fish
+++ b/fish/.config/fish/functions/is_git_dirty.fish
@@ -1,10 +1,9 @@
 function is_git_dirty
     # based on https://github.com/git/git/blob/master/git-sh-setup.sh#L210
 
-	is_git; or return 1
+    is_git; or return 1
 
-    if git diff-files --quiet --ignore-submodules 
-        and git diff-index --cached --quiet --ignore-submodules HEAD --
+    if git diff-files --quiet --ignore-submodules; and git diff-index --cached --quiet --ignore-submodules HEAD --
         return 1
     else
         # we're dirty
diff --git a/fish/.config/fish/functions/l.fish b/fish/.config/fish/functions/l.fish
index c8e95cb..d3088c0 100644
--- a/fish/.config/fish/functions/l.fish
+++ b/fish/.config/fish/functions/l.fish
@@ -1,4 +1,5 @@
-# Defined in /home/ben/.config/fish/functions/l.fish @ line 1
+complete -c l -w ls
+
 function l
 	ls -lah --group-directories-first $argv
 end