diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-17 09:54:19 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-17 09:54:19 +0100 |
commit | 68a902345d0643c303379599d7d29471ca296700 (patch) | |
tree | 21240ae6279a6999e904613eda239ba34f1bc62c /dts/scripts/filter.sh | |
parent | 80c2876fd7d8f4b8bb0caa3160b966147e6c8d46 (diff) | |
download | barebox-68a902345d0643c303379599d7d29471ca296700.tar.gz barebox-68a902345d0643c303379599d7d29471ca296700.tar.xz |
dts: update to v4.14-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/scripts/filter.sh')
-rwxr-xr-x | dts/scripts/filter.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dts/scripts/filter.sh b/dts/scripts/filter.sh index e82218a1ca..e1f6bac298 100755 --- a/dts/scripts/filter.sh +++ b/dts/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 |