From 4cf693abd0802e3dc2cc64d4af6db47f9b58ac33 Mon Sep 17 00:00:00 2001
From: Dylan Lom <dylanlom@gmail.com>
Date: Sat, 24 Apr 2021 20:58:54 +1000
Subject: [PATCH] Tidy up gut commit some more, improve gut amend

---
 src/gut.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/gut.sh b/src/gut.sh
index d6738f2..c43cb93 100755
--- a/src/gut.sh
+++ b/src/gut.sh
@@ -42,18 +42,22 @@ stash() {
         || git stash push
 }
 
-# Is anything already added (staged)
-#    then: commit that
-#    else: stage and commit everything 
+# If anything already added (staged):
+#    then commit that
+#    else prompt user to stage then commit
 commit() {
-    status
     git status --porcelain | grep -q '^[^ ]*A' \
         && git commit \
-        || (add; git commit)
+        || (status; add; git commit)
 }
 
+# If anything already added (staged):
+#    then amend that
+#    else amend all
 amend() {
-    git commit --amend -a
+    git status --porcelain | grep -q '^[^ ]*A' \
+        && git commit --amend \
+        || git commit --amend -a
 }
 
 status() {