Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicate setPathDisplay() #12385

Merged

Conversation

edolstra
Copy link
Member

@edolstra edolstra commented Jan 30, 2025

Motivation

Fixes messages like copying /tmp/repo/tmp/repo to the store. The PosixSourceAccessor constructor already sets the prefix. Setting the prefix twice shouldn't be a problem, but GitRepoImpl::getAccessor() returns a wrapped accessor so it's not actually idempotent.

It also fixes GitExportIgnoreSourceAccessor appending «unknown» to the prefix.

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

Fixes messages like 'copying /tmp/repo/tmp/repo to the store'. The
PosixSourceAccessor already sets the prefix. Setting the prefix twice
shouldn't be a problem, but GitRepoImpl::getAccessor() returns a
wrapped accessor so it's not actually idempotent.
@github-actions github-actions bot added with-tests Issues related to testing. PRs with tests have some priority fetching Networking with the outside (non-Nix) world, input locking labels Jan 30, 2025
@edolstra edolstra added the backport 2.26-maintenance Automatically creates a PR against the branch label Jan 30, 2025
@edolstra edolstra marked this pull request as draft January 30, 2025 11:18
In general we should set the path display prefix on the inner
accessor, so we now pass the display prefix to getAccessor().
@edolstra edolstra marked this pull request as ready for review January 30, 2025 16:04
@Mic92
Copy link
Member

Mic92 commented Feb 2, 2025

@mergify queue

Copy link
Contributor

mergify bot commented Feb 2, 2025

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 340eae1

mergify bot added a commit that referenced this pull request Feb 2, 2025
@mergify mergify bot merged commit 340eae1 into NixOS:master Feb 2, 2025
14 checks passed
mergify bot added a commit that referenced this pull request Feb 2, 2025
…2385

Fix duplicate setPathDisplay() (backport #12385)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.26-maintenance Automatically creates a PR against the branch fetching Networking with the outside (non-Nix) world, input locking with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants