Skip to content

Fix revert button to actually discard changes on staged files #1024

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
arnestrickmann merged 1 commit into from
Feb 23, 2026
+0 −17
Merged

Fix revert button to actually discard changes on staged files #1024

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
17 changes: 0 additions & 17 deletions src/main/services/GitService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,23 +166,6 @@ export async function revertFile(
taskPath: string,
filePath: string
): Promise<{ action: 'unstaged' | 'reverted' }> {
// Check if file is staged
try {
const { stdout: stagedStatus } = await execFileAsync(
'git',
['diff', '--cached', '--name-only', '--', filePath],
{
cwd: taskPath,
}
);

if (stagedStatus.trim()) {
// File is staged, unstage it (but keep working directory changes)
await execFileAsync('git', ['reset', 'HEAD', '--', filePath], { cwd: taskPath });
return { action: 'unstaged' };
}
} catch {}

// Check if file is tracked in git (exists in HEAD)
let fileExistsInHead = false;
try {
Expand Down