git untracked check tuned

1 files changed, 2 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 44131729..f4df9e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -143,10 +143,9 @@ tidy:
 	@for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done
 
 commit: tidy test
-	@echo ; echo -n "Run 'git commit -a'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
-	@git commit -a
+	@echo ; echo -n "Run 'git commit -a'? [Y/n/s] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s) ;; *) exit 1 ;; esac
 	@git status -u
-	@if git status --porcelain --ignored | awk '{print $2}' | grep ^swamid-2.0/ ; then echo "Untracked files in swamid-2.0/, aborting" ; exit 1 ; fi
+	@echo "Checking for untracked files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/  /' | grep . ; then echo "Untracked files in swamid-2.0/, aborting" ; exit 1 ; fi
 	@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
 	@git push