Skip to content

Update fluxcd/pkg/git with symlink removal fix - #1118

Draft
stefanprodan wants to merge 2 commits into
mainfrom
bump-pkg-git-symlinks
Draft

stefanprodan wants to merge 2 commits into
mainfrom
bump-pkg-git-symlinks

Conversation

@stefanprodan

@stefanprodan stefanprodan commented Oct 27, 2026 •

Copy link
Copy Markdown
Member

Fixes #1037

Depends on fluxcd/pkg#1354.

Changes:

  • Update github.com/fluxcd/pkg/git.
  • Add tests for switching branches over symlink changes.
  • Fix testutil.Clone on macOS, where the temp dir is reached through a symlink.

Supersedes #1077. Thanks to Jojin for the investigation.

The fix can be tested with ghcr.io/fluxcd/image-automation-controller:rc-638e519a. This image requires Flux 2.10.

The temp dir on macOS is reached through a symlink, which BoundOS
rejects for nested paths. Resolve it before binding the filesystem.

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>

@matheuscscp matheuscscp left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Switching to a push branch where a tracked symlink was removed or
replaced deleted the link's target instead of the link, failing with
"no such file or directory" or leaving the worktree without files that
are still tracked, including .git/config.

Add tests for switching branches over symlink changes.

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
@stefanprodan
stefanprodan force-pushed the bump-pkg-git-symlinks branch from 3464236 to 638e519 Compare October 28, 2026 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Controller errors when attempting to delete a non-existent file

2 participants