Commit 152a826
committed
fix(source-checkout): include
`CheckoutGit::new` keyed only on `RepositoryReference` (URL +
reference) and `compute` rebuilt `GitUrl` from the reference alone, so
`resolver.fetch` always received `precise = None` and re-resolved to
the branch's current HEAD. Two callers with different pinned commits
on the same branch collided on a single cache slot, and
`checkout_pinned_source(commit_A)` could silently return a
`SourceCheckout` whose `path` pointed at commit B's checkout while
`pinned` reported commit A. That's how a freshly-fetched manifest's
tightened `host-dependencies` leaked into a build whose lock-file
still pinned the older commit's host_packages, producing the silent
`setuptools <82.0.0 | 82.0.1` mismatch in #6073.
Key on the full `GitUrl` and pass it through unchanged so the resolver
honours `precise` when set and advances to HEAD only when not.precise in CheckoutGit dedup key1 parent 1591cb5 commit 152a826
2 files changed
Lines changed: 19 additions & 15 deletions
File tree
- crates
- pixi_command_dispatcher/tests/integration/snapshots
- pixi_compute_sources/src
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | | - | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
14 | | - | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
99 | | - | |
100 | | - | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
101 | 104 | | |
102 | | - | |
103 | | - | |
| 105 | + | |
| 106 | + | |
104 | 107 | | |
105 | 108 | | |
106 | 109 | | |
107 | | - | |
| 110 | + | |
108 | 111 | | |
109 | 112 | | |
110 | 113 | | |
| |||
119 | 122 | | |
120 | 123 | | |
121 | 124 | | |
| 125 | + | |
122 | 126 | | |
123 | | - | |
| 127 | + | |
124 | 128 | | |
125 | 129 | | |
126 | 130 | | |
| |||
132 | 136 | | |
133 | 137 | | |
134 | 138 | | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
140 | 142 | | |
141 | 143 | | |
142 | | - | |
| 144 | + | |
143 | 145 | | |
144 | 146 | | |
145 | 147 | | |
| |||
211 | 213 | | |
212 | 214 | | |
213 | 215 | | |
| 216 | + | |
0 commit comments