summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFredrik Åslund <fredrik.aslund@umu.se>2014-04-09 08:22:36 +0200
committerFredrik Åslund <fredrik.aslund@umu.se>2014-04-09 08:22:36 +0200
commit81a3cf90fa1d166fa6937e8c5fa04e487fd984cd (patch)
tree59ac1d903a169cddd3fb808fb611252b50414f8e /Makefile
parent8f83a1899d07cfc939bc04179841a8b4bc2f584d (diff)
new keys for samltest
SWAMIDOPS-7208
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9c0bc213..160c6577 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ committest: test
@for x in `find $(SRCDIRS) -name \*.xml`; do if ! grep -qx `basename $$x` sp-with-simplesign && grep -q HTTP-POST-SimpleSign $$x ; then echo " $$x" ; fi ; done | grep . && exit 1 || true
commit: tidy committest
- @git diff --color
+ @git diff --color || true
@echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
@git status -u
@echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi