1
0
Fork 0
mirror of https://code.forgejo.org/actions/cascading-pr synced 2025-03-15 06:46:59 +01:00

git fetch origin, not $destination

This commit is contained in:
Earl Warren 2023-10-15 17:29:34 +02:00
parent ab3031942c
commit 89767f29db
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00

View file

@ -124,7 +124,7 @@ function upsert_clone() {
cd $TMPDIR/$direction cd $TMPDIR/$direction
git config credential.helper "store --file=$TMPDIR/$direction.git-credentials" git config credential.helper "store --file=$TMPDIR/$direction.git-credentials"
if $fetch; then if $fetch; then
git fetch $direction git fetch origin
fi fi
git config user.email cascading-pr@example.com git config user.email cascading-pr@example.com
git config user.name cascading-pr git config user.name cascading-pr
@ -158,7 +158,6 @@ function update() {
upsert_clone destination ${options[destination_head]} ${options[destination_clone]} upsert_clone destination ${options[destination_head]} ${options[destination_clone]}
( (
cd $TMPDIR/origin cd $TMPDIR/origin
ls -l $TMPDIR/destination
${options[update]} $TMPDIR/destination $TMPDIR/destination-pr.json $TMPDIR/origin-pr.json ${options[update]} $TMPDIR/destination $TMPDIR/destination-pr.json $TMPDIR/origin-pr.json
) )
push destination ${options[destination_head]} ${options[destination_clone]} push destination ${options[destination_head]} ${options[destination_clone]}