sup39/firefish
1
0
Fork 0
forked from naskya/firefish
Code Issues Pull requests Activity

dev: use ipv4 to git pull for now (as ipv6 network has an issue)

Browse source
This commit is contained in:
naskya 2023-10-10 23:56:04 +09:00
parent 1e4e2d9a23
commit 11b29dd5a3
Signed by: naskya
GPG key ID: 164DFF24E2D40139
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
update.sh
View file

@ -36,8 +36,8 @@ say "Pulling changes from the remote repo..."
running "git checkout -- package.json packages/backend/assets" running "git checkout -- package.json packages/backend/assets"
git checkout -- package.json packages/backend/assets git checkout -- package.json packages/backend/assets
running "git pull --ff --no-edit --autostash --strategy-option theirs" running "git pull --ff --no-edit --autostash --strategy-option theirs --ipv4"
git pull --ff --no-edit --autostash --strategy-option theirs git pull --ff --no-edit --autostash --strategy-option theirs --ipv4
NEW_COMMIT=$(git rev-parse --short HEAD) NEW_COMMIT=$(git rev-parse --short HEAD)
say "Pulled successfully! Now we're on \`${NEW_COMMIT}\`\n" say "Pulled successfully! Now we're on \`${NEW_COMMIT}\`\n"