diff options
author | Denton Liu | 2023-04-29 02:17:01 -0700 |
---|---|---|
committer | Denton Liu | 2023-04-29 03:10:13 -0700 |
commit | 8aceee81dada8fa4eb96dcd615bd1bf232955b9c (patch) | |
tree | f478d4595ead81e0a0c713e5b06df76da00c361e | |
parent | d6cf1cde293d8170e3de6860c12c93e9bf9d34ba (diff) | |
download | aur-8aceee81dada8fa4eb96dcd615bd1bf232955b9c.tar.gz |
Remove subdirectories in update-branch.sh
-rwxr-xr-x | update-branch.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/update-branch.sh b/update-branch.sh index f089966cc905..aedb88d4837e 100755 --- a/update-branch.sh +++ b/update-branch.sh @@ -7,18 +7,12 @@ LOCAL_BRANCH=upstream git fetch "$REMOTE_URL" "$REMOTE_BRANCH" git checkout -B "$LOCAL_BRANCH" FETCH_HEAD FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --subdirectory-filter trunk \ - --tree-filter '(makepkg --printsrcinfo; status=$?; echo; exit $status) >.SRCINFO || rm .SRCINFO' \ + --tree-filter 'git rm -rf keys; { makepkg --printsrcinfo && echo; } >.SRCINFO || rm .SRCINFO' \ --commit-filter ' if [ -e .SRCINFO ] then git commit-tree "$@" else - shift - while [ -n "$1" ] - do - shift - map "$1" - shift - done + skip_commit "$@" fi' git checkout - |