Page MenuHomePhabricator

D14159.id41105.diff
No OneTemporary

D14159.id41105.diff

diff --git a/contrib/extract-secp256k1.sh b/contrib/extract-secp256k1.sh
--- a/contrib/extract-secp256k1.sh
+++ b/contrib/extract-secp256k1.sh
@@ -8,41 +8,16 @@
exit 1
fi
-WORKDIR=$(mktemp -d)
-function cleanup {
- echo Deleting workdir ${WORKDIR}
- rm -rf "${WORKDIR}"
-}
-trap cleanup EXIT
-
-echo Using workdir ${WORKDIR}
-
# Find the source repository's location.
pushd "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
REPO_DIR=$(git rev-parse --show-toplevel)
popd
-git clone "file://${REPO_DIR}" "${WORKDIR}" -b master
-
-pushd "${WORKDIR}"
-# shellcheck disable=SC1004
-FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch \
- --index-filter 'git ls-files \
- | grep -v "^cmake\|^src/secp256k1" \
- | xargs git rm -q --cached;
- git ls-files -s \
- | sed "s%src/secp256k1/%%" \
- | git update-index --index-info;
- git rm -rq --cached --ignore-unmatch src/secp256k1' \
- --prune-empty -- --all
-popd
-
-# filter-branch is full of gotcha and can leave the repo is a strange state,
-# so we make a fresh new one.
-git clone "file://${WORKDIR}" secp256k1
+git clone "file://${REPO_DIR}" secp256k1 -b master
pushd secp256k1
-git remote add github https://github.com/Bitcoin-ABC/secp256k1.git
+git filter-repo --path src/secp256k1 --path cmake --path-rename src/secp256k1/:
+git remote add github git@github.com:Bitcoin-ABC/secp256k1.git
git pull github master --rebase
git gc --prune=now
-
+popd
diff --git a/contrib/utils/install-dependencies-bullseye.sh b/contrib/utils/install-dependencies-bullseye.sh
--- a/contrib/utils/install-dependencies-bullseye.sh
+++ b/contrib/utils/install-dependencies-bullseye.sh
@@ -32,6 +32,7 @@
gcc-9-multilib
gettext-base
git
+ git-filter-repo
golang
gnupg
graphviz

File Metadata

Mime Type
text/plain
Expires
Tue, May 20, 22:13 (20 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5866031
Default Alt Text
D14159.id41105.diff (1 KB)

Event Timeline