Skip to content

Commit 1acb634

Browse files
committed
pacman-helper quick_add: try harder to stay in sync with pacman-repo
The worktrees are initialized before the lease is acquired, therefore if the lease could not be acquired right away, chances are that the worktree will be stale once the lease _can_ be acquired. This was the case in https://github.com/git-for-windows/git-for-windows-automation/actions/runs/13378287807/job/37362013059#step:20:71 where a concurrent deployment succeeded and updated both Pacman repositories in the meantime, and the worktree was hence outdated and the up to date check failed thusly: git-for-windows-i686.db.tar.xz: needs update git-for-windows-i686.db.tar.xz.sig: needs update git-for-windows-i686.files.tar.xz: needs update git-for-windows-i686.files.tar.xz.sig: needs update The package databases in i686 differ between Azure Blobs and pacman-repo Let's just update the branch just before downloading the package databases from Azure Blobs, to give it a chance to be in sync. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e3a5828 commit 1acb634

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

pacman-helper.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ quick_add () { # <file>...
305305
test -n "$msys$mingw" || continue
306306
to_push="${to_push:+$to_push }$arch"
307307

308+
git -C "$dir/$arch" pull --ff-only origin $arch ||
309+
die "Could not update $dir/$arch"
310+
308311
case "$arch,$mingw" in
309312
*,) db2=;;
310313
i686,*) db2=mingw32;;

0 commit comments

Comments
 (0)