summaryrefslogtreecommitdiff
path: root/scripts/filter.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/filter.sh')
-rwxr-xr-xscripts/filter.sh3
1 files changed, 2 insertions, 1 deletions
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