Repository navigation
Commit 064cf8f
fix(server): an upstream shadowed by a local origin/<branch> branch keeps its real remote (pingdotgg#29180)
Co-authored-by: Claude Opus 5.5 <[email protected]>1 parent a4f4741 commit 064cf8f
2 files changed
Lines changed: 13 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3169 | 3169 | | |
3170 | 3170 | | |
3171 | 3171 | | |
3172 | | - | |
| 3172 | + | |
3173 | 3173 | | |
3174 | 3174 | | |
| 3175 | + | |
3175 | 3176 | | |
| 3177 | + | |
| 3178 | + | |
3176 | 3179 | | |
| 3180 | + | |
| 3181 | + | |
| 3182 | + | |
3177 | 3183 | | |
3178 | 3184 | | |
3179 | 3185 | | |
3180 | 3186 | | |
3181 | 3187 | | |
| 3188 | + | |
| 3189 | + | |
3182 | 3190 | | |
3183 | 3191 | | |
3184 | 3192 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1293 | 1293 | | |
1294 | 1294 | | |
1295 | 1295 | | |
| 1296 | + | |
1296 | 1297 | | |
1297 | 1298 | | |
1298 | 1299 | | |
1299 | 1300 | | |
1300 | | - | |
| 1301 | + | |
1301 | 1302 | | |
1302 | | - | |
| 1303 | + | |
1303 | 1304 | | |
1304 | 1305 | | |
1305 | 1306 | | |
| |||
2032 | 2033 | | |
2033 | 2034 | | |
2034 | 2035 | | |
2035 | | - | |
| 2036 | + | |
2036 | 2037 | | |
2037 | 2038 | | |
2038 | 2039 | | |
| |||
0 commit comments