diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2017-11-13 20:15:33 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2017-11-13 20:15:33 +0000 |
| commit | 550370858c61e6f7fe3832de73daa9cc25ba716a (patch) | |
| tree | b8d380020ec7026d5a54e3a2c67ef46ac8859511 /scripts/filter.sh | |
| parent | d5464ff11700ac44568e6816e00d1d1427cc46ae (diff) | |
Diffstat (limited to 'scripts/filter.sh')
| -rwxr-xr-x | scripts/filter.sh | 3 |
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 |