diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-03 10:24:26 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-04 08:40:35 +0100 |
| commit | d597afe7fbb0ac8ed0bcc48a5a73ca0ff62e7e63 (patch) | |
| tree | d506afe0865a0bd5cc380e6bf751b38db77841b3 /dts/scripts/filter.sh | |
| parent | 73b35531b70acd011a2b9e0558689d15e5ada781 (diff) | |
| download | barebox-d597afe7fbb0ac8ed0bcc48a5a73ca0ff62e7e63.tar.gz barebox-d597afe7fbb0ac8ed0bcc48a5a73ca0ff62e7e63.tar.xz | |
dts: update to v4.4-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/scripts/filter.sh')
| -rwxr-xr-x | dts/scripts/filter.sh | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/dts/scripts/filter.sh b/dts/scripts/filter.sh new file mode 100755 index 0000000000..e82218a1ca --- /dev/null +++ b/dts/scripts/filter.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# git branch -D upstream/rewritten-prev upstream/master upstream/rewritten filter-state + +set -e + +export SCRIPTS=$(dirname $(readlink -f $0)) + +UPSTREAM_MASTER=upstream/master +UPSTREAM_REWRITTEN=upstream/dts + +LAST=$(git show-ref -s refs/heads/$UPSTREAM_MASTER||true) +if [ -n "$LAST" ] ; then + RANGE="$LAST..$UPSTREAM_REWRITTEN" +else + # This must be a new conversion... + RANGE="$UPSTREAM_REWRITTEN" +fi + +FETCH_HEAD=$(git rev-parse FETCH_HEAD) +if [ "$LAST" = "$FETCH_HEAD" ] ; then + echo "Nothing new in FETCH_HEAD: $FETCH_HEAD" + exit 0 +fi + +rm -f .git/refs/original/refs/heads/${UPSTREAM_REWRITTEN} + +git branch -f $UPSTREAM_REWRITTEN FETCH_HEAD + +sh $SCRIPTS/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' \ + --prune-empty --state-branch refs/heads/filter-state \ + -- $RANGE + +git branch -f $UPSTREAM_MASTER FETCH_HEAD |