From ebb71efc1e74076017f3a983b4cb4a3311925d14 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Mon, 9 Feb 2015 08:18:15 +0100 Subject: 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. --- cfg.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } || : -- cgit v1.2.3-70-g09d2