diff options
Diffstat (limited to 'scripts/filter.sh')
| -rwxr-xr-x | scripts/filter.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/filter.sh b/scripts/filter.sh index 5e10ff417766..998b8f0a144c 100755 --- a/scripts/filter.sh +++ b/scripts/filter.sh @@ -1,6 +1,6 @@ #!/bin/sh -# git branch -D upstream/rewritten-prev upstream/master upstream/rewritten filter-state +# git branch -D upstream/rewritten-prev upstream/master upstream/rewritten filter-state-split set -e @@ -29,12 +29,12 @@ rm -f .git/refs/original/refs/heads/${UPSTREAM_REWRITTEN} git branch -f $UPSTREAM_REWRITTEN FETCH_HEAD -git filter-branch --force \ +PATH=$(git --exec-path):$PATH $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' \ --parent-filter 'sed "s/-p //g" | xargs -r git show-branch --independent | sed "s/\</-p /g"' \ - --prune-empty --state-branch refs/heads/filter-state \ + --prune-empty --state-branch refs/heads/filter-state-split \ -- $RANGE git branch -f $UPSTREAM_MASTER FETCH_HEAD |