Skip to content

Commit e51e1f5

Browse files
committed
Fix remote name ordering in listRemoteNames to preserve longest-first for correct prefix disambiguation
Remove .toReversed() from listRemoteNames so it returns remotes in longest-first order (as produced by parseRemoteNames). This ensures parseUpstreamRefWithRemoteNames in resolveCurrentUpstream correctly disambiguates prefix-overlapping remote names (e.g. 'my-org' vs 'my-org/upstream').
1 parent d5513de commit e51e1f5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

apps/server/src/git/Layers/GitCore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
927927

928928
const listRemoteNames = (cwd: string): Effect.Effect<ReadonlyArray<string>, GitCommandError> =>
929929
runGitStdout("GitCore.listRemoteNames", cwd, ["remote"]).pipe(
930-
Effect.map((stdout) => parseRemoteNames(stdout).toReversed()),
930+
Effect.map((stdout) => parseRemoteNames(stdout)),
931931
);
932932

933933
const resolvePrimaryRemoteName = Effect.fn("resolvePrimaryRemoteName")(function* (cwd: string) {

0 commit comments

Comments
 (0)