s

brendan-kellam · brendan-kellam · commit c3c24eb02822 · 2026-03-25T19:34:29.000-07:00
diff --git a/packages/web/src/lib/gitattributes.ts b/packages/web/src/lib/gitattributes.ts
@@ -64,7 +64,7 @@ export function parseGitAttributes(content: string): GitAttributes {
 export function resolveLanguageFromGitAttributes(filePath: string, gitAttributes: GitAttributes): string | undefined {
     let language: string | undefined;
     for (const rule of gitAttributes.rules) {
-        if (micromatch.isMatch(filePath, rule.pattern) && rule.attrs['linguist-language']) {
+        if (micromatch.isMatch(filePath, rule.pattern, { matchBase: true }) && rule.attrs['linguist-language']) {
             language = rule.attrs['linguist-language'];
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export function parseGitAttributes(content: string): GitAttributes {`
`64`	`64`	`export function resolveLanguageFromGitAttributes(filePath: string, gitAttributes: GitAttributes): string \| undefined {`
`65`	`65`	`let language: string \| undefined;`
`66`	`66`	`for (const rule of gitAttributes.rules) {`
`67`		`- if (micromatch.isMatch(filePath, rule.pattern) && rule.attrs['linguist-language']) {`
	`67`	`+ if (micromatch.isMatch(filePath, rule.pattern, { matchBase: true }) && rule.attrs['linguist-language']) {`
`68`	`68`	`language = rule.attrs['linguist-language'];`
`69`	`69`	`}`
`70`	`70`	`}`