Skip to content

fix(github): drop a clone URL's .git before a trailing slash or query #21325

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.

Sign up for GitHub

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

Open
only21mil wants to merge 3 commits into
base: main
Choose a base branch
from
+26 −3
Open

fix(github): drop a clone URL's .git before a trailing slash or query #21325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c93d35
test(github): repository selectors keep a .git suffix in the name
only21mil Oct 18, 2026
d36fc13
fix(github): drop a clone URL's .git before a trailing slash or query
only21mil Oct 18, 2026
c918e6f
fix(github): strip only one .git suffix from a URL selector
only21mil Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions packages/source-control-github/src/server/gitHubRepositoryResolution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { assert, describe, it } from "@effect/vitest";

import {
gitHubApiHostForRemote,
parseGitHubRepositorySelector,
selectGitHubBaseRepository,
} from "./gitHubRepositoryResolution.ts";

Expand Down Expand Up @@ -74,6 +75,26 @@ describe("selectGitHubBaseRepository", () => {
});
});

describe("parseGitHubRepositorySelector", () => {
it("drops a clone URL's .git suffix wherever the selector ends", () => {
for (const [selector, host, name] of [
["https://github.com/acme/web.git", "github.com", "web"],
["https://github.com/acme/web.git/", "github.com", "web"],
["https://github.com/acme/web.git?tab=readme", "github.com", "web"],
["https://github.com/acme/web.git.git", "github.com", "web.git"],
["https://github.com/acme/web.git.git/", "github.com", "web.git"],
["acme/web.git/", "github.com", "web"],
["ghe.example.com/acme/web.git/", "ghe.example.com", "web"],
] as const) {
assert.deepStrictEqual(parseGitHubRepositorySelector(selector, "github.com"), {
host,
owner: "acme",
name,
});
}
});
});

describe("gitHubApiHostForRemote", () => {
it("reads an SSH alias through github.com and a real host as itself", () => {
assert.strictEqual(gitHubApiHostForRemote("git@github:acme/web.git"), "github.com");
Expand Down
8 changes: 5 additions & 3 deletions packages/source-control-github/src/server/gitHubRepositoryResolution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,21 @@ export function parseGitHubRepositorySelector(
selector: string,
defaultHost: string,
): GitHubRepositoryLocator | null {
const trimmed = selector.trim().replace(/\.git$/i, "");
// Like gh, a clone URL's `.git` comes off the path, before any trailing slash, query or fragment.
const withoutGitSuffix = (path: string) => path.replace(/\.git\/*$/i, "");
const trimmed = selector.trim();
if (/^https?:\/\//i.test(trimmed)) {
try {
const url = new URL(trimmed);
const [owner, name, ...rest] = url.pathname.split("/").filter(Boolean);
const [owner, name, ...rest] = withoutGitSuffix(url.pathname).split("/").filter(Boolean);
return owner && name && rest.length === 0
? { host: url.host.toLowerCase(), owner, name }
: null;
} catch {
return null;
}
}
const parts = trimmed.split("/").filter(Boolean);
const parts = withoutGitSuffix(trimmed).split("/").filter(Boolean);
if (parts.length === 2) return { host: defaultHost, owner: parts[0]!, name: parts[1]! };
if (parts.length === 3)
return { host: parts[0]!.toLowerCase(), owner: parts[1]!, name: parts[2]! };
Expand Down
Loading