From 550370858c61e6f7fe3832de73daa9cc25ba716a Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Mon, 13 Nov 2017 20:15:33 +0000
Subject: Update our copies of the Device Tree Source to Linux 4.14

---
 scripts/filter.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/filter.sh')

diff --git a/scripts/filter.sh b/scripts/filter.sh
index e82218a1ca9d..e1f6bac29884 100755
--- a/scripts/filter.sh
+++ b/scripts/filter.sh
@@ -27,10 +27,11 @@ rm -f .git/refs/original/refs/heads/${UPSTREAM_REWRITTEN}
 
 git branch -f $UPSTREAM_REWRITTEN FETCH_HEAD
 
-sh $SCRIPTS/git-filter-branch --force \
+git filter-branch --force \
 	--index-filter ${SCRIPTS}/index-filter.sh \
 	--msg-filter 'cat && /bin/echo -e "\n[ upstream commit: $GIT_COMMIT ]"' \
 	--tag-name-filter 'while read t ; do /bin/echo -n $t-dts-raw ; done' \
+	--parent-filter 'sed "s/-p //g" | xargs -r git show-branch --independent | sed "s/\</-p /g"' \
 	--prune-empty --state-branch refs/heads/filter-state \
 	-- $RANGE
 
-- 
cgit v1.3