summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Voelker <mail@bernhard-voelker.de>2015-02-09 08:18:15 +0100
committerBernhard Voelker <mail@bernhard-voelker.de>2015-02-09 10:42:04 +0100
commitebb71efc1e74076017f3a983b4cb4a3311925d14 (patch)
tree5e0843e3a035b1584d364ead0bd2b5c774f86f8a
parent7b1ca5ffd6f0d50dd21558572c44296f8a3e59bb (diff)
downloadcoreutils-ebb71efc1e74076017f3a983b4cb4a3311925d14.tar.xz
maint: make sc_THANKS_in_duplicates more robust
The previous commit v8.23-124-g7b1ca5f made the above syntax-check rule fail, because that took the whole content of THANKS.in for comparison. * cfg.mk (sc_THANKS_in_duplicates): Strip off the header (all before the first empty line) and the footer (all past the next empty line) from 'THANKS.in' for the check.
-rw-r--r--cfg.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/cfg.mk b/cfg.mk
index c1a46585f..4803074f8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -606,7 +606,8 @@ sc_preprocessor_indentation:
# this rule detects that their pair may now be removed from THANKS.in.
sc_THANKS_in_duplicates:
@{ git log --pretty=format:%aN | sort -u; \
- cut -b-36 THANKS.in | sed '/^$$/d;s/ *$$//'; } \
+ cut -b-36 THANKS.in \
+ | sed '/^$$/,/^$$/!d;/^$$/d;s/ *$$//'; } \
| sort | uniq -d | grep . \
&& { echo '$(ME): remove the above names from THANKS.in' \
1>&2; exit 1; } || :