Merge branch 'jk/blame-fixes' into maint

diff --git a/Makefile b/Makefile
index f42b1953d8d66f882ae09bd97b7d0e12af88bf2b..76267262c155fa907cc6e806f8eb1ce1108e3a6a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2150,10 +2150,20 @@ po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
        $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
 
 FIND_SOURCE_FILES = ( \
-       git ls-files '*.[hcS]' 2>/dev/null || \
+       git ls-files \
+               '*.[hcS]' \
+               '*.sh' \
+               ':!*[tp][0-9][0-9][0-9][0-9]*' \
+               ':!contrib' \
+               2>/dev/null || \
        $(FIND) . \
                \( -name .git -type d -prune \) \
+               -o \( -name '[tp][0-9][0-9][0-9][0-9]*' -prune \) \
+               -o \( -name contrib -type d -prune \) \
+               -o \( -name build -type d -prune \) \
+               -o \( -name 'trash*' -type d -prune \) \
                -o \( -name '*.[hcS]' -type f -print \) \
+               -o \( -name '*.sh' -type f -print \) \
        )
 
 $(ETAGS_TARGET): FORCE