Skip to content

fix(desktop): remove invalid -M flag from git status command #997

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

Merged
Kitenite merged 1 commit into from
Jan 28, 2026
Merged

fix(desktop): remove invalid -M flag from git status command #997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ export async function getStatusNoLock(repoPath: string): Promise<StatusResult> {
// Run git status with --no-optional-locks to avoid holding locks
// Use porcelain=v1 for machine-parseable output, -b for branch info
// Use -z for NUL-terminated output (handles filenames with special chars)
// Use -M for rename detection (otherwise renames show as delete + add)
// Use -uall to show individual files in untracked directories (not just the directory)
// Note: porcelain=v1 already includes rename info (R/C status codes) without needing -M
const { stdout } = await execFileAsync(
"git",
[
Expand All @@ -72,7 +72,6 @@ export async function getStatusNoLock(repoPath: string): Promise<StatusResult> {
"--porcelain=v1",
"-b",
"-z",
"-M",
"-uall",
],
{ env, timeout: 30_000 },
Expand Down