Skip to content

git_fetch: make sparse path mirror projections unique#51080

Merged
psakievich merged 7 commits intospack:developfrom
psakievich:sparse-bugs
Aug 4, 2025
Merged

git_fetch: make sparse path mirror projections unique#51080
psakievich merged 7 commits intospack:developfrom
psakievich:sparse-bugs

Conversation

@psakievich
Copy link
Copy Markdown
Contributor

@psakievich psakievich commented Jul 30, 2025

For two packages sharing the same commit plus sparse paths the mirror layout is overriding one another. This PR is to resolve the issue. This should be back-ported to 1.0.1 since it affects the ability to generate a mirror correctly.

See #50699

For two packages sharing the same commit plus sparse paths the mirror
layout is overriding one another

See spack#50699

Signed-off-by: psakiev <[email protected]>
@psakievich psakievich added the snl-core-team Issue for SNL Spack developers label Jul 30, 2025
Apply changes suggested by @tjfulle in spack#50699

Signed-off-by: psakiev <[email protected]>
@psakievich psakievich mentioned this pull request Jul 31, 2025
4 tasks
@psakievich psakievich marked this pull request as ready for review July 31, 2025 04:10
@psakievich psakievich added this to the v1.1.0 milestone Jul 31, 2025
@psakievich psakievich changed the title git_fetch: sparse path stages aren't unique git_fetch: make sparse path mirror projections unique Jul 31, 2025
@psakievich psakievich added the bugfix Something wasn't working, here's a fix label Jul 31, 2025
Copy link
Copy Markdown
Member

@haampie haampie left a comment

Choose a reason for hiding this comment

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

I don't think the test is accurate.

@becker33 becker33 added the v1.0.1 PRs to backport for v1.0.1 label Jul 31, 2025
@psakievich psakievich requested a review from haampie July 31, 2025 10:27
Signed-off-by: psakiev <[email protected]>
@psakievich psakievich requested a review from haampie July 31, 2025 12:02
becker33
becker33 previously approved these changes Jul 31, 2025
@psakievich psakievich enabled auto-merge (squash) August 4, 2025 14:55
@psakievich
Copy link
Copy Markdown
Contributor Author

I'm setting to automerge. This is breaking us from updating spack to 1.0. I believe all review requests have been resolved.

@psakievich
Copy link
Copy Markdown
Contributor Author

Closes #50699

@psakievich psakievich merged commit dfd0dae into spack:develop Aug 4, 2025
32 of 33 checks passed
haampie pushed a commit that referenced this pull request Aug 11, 2025
* git_fetch: sparse path stages aren't unique

For two packages sharing the same commit plus sparse paths the mirror
layout is overriding one another

See #50699

Signed-off-by: psakiev <[email protected]>

* Apply changes from @tjfulle

Apply changes suggested by @tjfulle in #50699

Signed-off-by: psakiev <[email protected]>

* Remove superfluous test lines

Signed-off-by: psakiev <[email protected]>

* Pathlib for git projection

Signed-off-by: psakiev <[email protected]>

* Update test comment

Signed-off-by: psakiev <[email protected]>

* Use hash for sparse-path list

Signed-off-by: psakiev <[email protected]>

* Use reproducible hash algorithm

Signed-off-by: psakiev <[email protected]>

---------

Signed-off-by: psakiev <[email protected]>
Signed-off-by: Harmen Stoppels <[email protected]>
@haampie haampie mentioned this pull request Aug 11, 2025
29 tasks
alecbcs pushed a commit that referenced this pull request Aug 12, 2025
* git_fetch: sparse path stages aren't unique

For two packages sharing the same commit plus sparse paths the mirror
layout is overriding one another

See #50699

Signed-off-by: psakiev <[email protected]>

* Apply changes from @tjfulle

Apply changes suggested by @tjfulle in #50699

Signed-off-by: psakiev <[email protected]>

* Remove superfluous test lines

Signed-off-by: psakiev <[email protected]>

* Pathlib for git projection

Signed-off-by: psakiev <[email protected]>

* Update test comment

Signed-off-by: psakiev <[email protected]>

* Use hash for sparse-path list

Signed-off-by: psakiev <[email protected]>

* Use reproducible hash algorithm

Signed-off-by: psakiev <[email protected]>

---------

Signed-off-by: psakiev <[email protected]>
Signed-off-by: Harmen Stoppels <[email protected]>
alstar555 pushed a commit to alstar555/spack that referenced this pull request Aug 27, 2025
* git_fetch: sparse path stages aren't unique

For two packages sharing the same commit plus sparse paths the mirror
layout is overriding one another

See spack#50699

Signed-off-by: psakiev <[email protected]>

* Apply changes from @tjfulle

Apply changes suggested by @tjfulle in spack#50699

Signed-off-by: psakiev <[email protected]>

* Remove superfluous test lines

Signed-off-by: psakiev <[email protected]>

* Pathlib for git projection

Signed-off-by: psakiev <[email protected]>

* Update test comment

Signed-off-by: psakiev <[email protected]>

* Use hash for sparse-path list

Signed-off-by: psakiev <[email protected]>

* Use reproducible hash algorithm

Signed-off-by: psakiev <[email protected]>

---------

Signed-off-by: psakiev <[email protected]>
Signed-off-by: Angelica Loshak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix Something wasn't working, here's a fix snl-core-team Issue for SNL Spack developers v1.0.1 PRs to backport for v1.0.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants