aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-11 14:46:31 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-11 14:49:50 -0800
commit8bb4646dae89035695e72a39d6fe1c0f364ea0aa (patch)
tree1bb31c78644ac1eb034212b97f3730733286ebae /Makefile
parenta9645b780b698703cd7dee25051d6ce39b0544c6 (diff)
parent9db56f71b91153f4076a796c80c61f00edd8b700 (diff)
downloadgit-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.gz
git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.xz
Merge branch 'maint'
* maint: Fix non-literal format in printf-style calls git-submodule: Avoid printing a spurious message. git ls-remote: make usage string match manpage Makefile: help people who run 'make check' by mistake
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 220de3991..920cb4207 100644
--- a/Makefile
+++ b/Makefile
@@ -1355,7 +1355,16 @@ check-sha1:: test-sha1$X
./test-sha1.sh
check: common-cmds.h
- for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
+ if sparse; \
+ then \
+ for i in *.c; \
+ do \
+ sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \
+ done; \
+ else \
+ echo 2>&1 "Did you mean 'make test'?"; \
+ exit 1; \
+ fi
remove-dashes:
./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)