diff --git a/share/Makefile.linting b/share/Makefile.linting
index 01588a4d27fc80a071ba6a21428c87e817e4e851..0fbb7c3cd320cec25eead6d358c4f730473a6f29 100644
--- a/share/Makefile.linting
+++ b/share/Makefile.linting
@@ -207,8 +207,12 @@ LINT.dir=$(wildcard $(LINT_DIR))
 
 ######## LINT_DIFF filter
 
+define LINT.file-list-from-git-diff-info
+$(GIT) diff --name-status $(1) | $(GREP) -v "^D" | $(SED) -e "s/^[CR][0-9]\+[ \t]\+[^ \t]\+[ \t]\+//" -e "s/^[AM][ \t]*//"
+endef
+
 define LINT.file-list-from-git-diff
-$(GIT) diff --name-status $(1) | $(GREP) -v "^D" | $(SED) "s/^.[ \t]*//" | $(TR) '\n' '\000'
+$(call LINT.file-list-from-git-diff-info,$(1)) | $(TR) '\n' '\000'
 endef
 
 define LINT.file-list-filter-with-git-diff
@@ -218,7 +222,7 @@ $$(LINT.$(1)-filter-targets):: LINT.FILE_LIST=$$(call LINT.file-list-from-git-di
 $$(LINT.$(1)-filter-targets):: %.$(1) : $(3) %
 	@echo [LINT] Done: LINT_DIFF=\"$(2)\" make $$(basename $$@)
 	@echo [LINT] checked file list:
-	$$(GIT) diff --name-status $(2)
+	$$(call LINT.file-list-from-git-diff-info,$(2))
 endef
 
 ifeq ($(LINT_DIFF),)