feat: stash changes only if there are uncommited changes

joseluisq · Jul 21, 2020 · 6acf46f · 6acf46f
1 parent 665be6b
commit 6acf46f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/conf.d/gitnow.fish b/conf.d/gitnow.fish
@@ -310,13 +310,21 @@ function move -d "GitNow: Switch from current branch to another but stashing unc
         return
     end
 
-    command git stash
+    set -l v_stashed (__gitnow_has_uncommited_changes)
+
+    # Stash changes before checkout for uncommited changes only
+    if test $v_stashed
+        command git stash
+    end
+
     command git checkout $v_branch
 
     # --no-apply-stash
     if test -n "$v_no_apply_stash"
         echo "Stashed changes were not applied. Use `git stash pop` to apply them."
-    else
+    end
+
+    if begin test $v_stashed; and not test -n "$v_no_apply_stash"; end
         command git stash pop
         echo "Stashed changes applied."
     end

diff --git a/functions/__gitnow_functions.fish b/functions/__gitnow_functions.fish
@@ -141,3 +141,7 @@ end
 function __gitnow_is_git_repository
     command git rev-parse --git-dir >/dev/null 2>&1
 end
+
+function __gitnow_has_uncommited_changes
+    command git diff-index --quiet HEAD -- || echo "1" 2>&1
+end