ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-16 21:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Handle staged-new files correctly in discard changes

Browse Source
This commit is contained in:
gsxdsm
2026-02-17 23:19:38 -08:00
parent 887e2ea76b
commit bddf1a4bf8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/server/src/routes/worktree/routes/discard-changes.ts
View File

@@ -122,12 +122,18 @@ export function createDiscardChangesHandler() {
if (indexStatus === '?' && workTreeStatus === '?') {
untrackedFiles.push(file.path);
} else if (indexStatus === 'A') {
// Staged-new file: must be reset (unstaged) then cleaned (deleted).
// Never pass to trackedModified — the file has no HEAD version to
// check out, so `git checkout --` would fail or do nothing.
stagedFiles.push(file.path);
untrackedFiles.push(file.path);
} else {
// Check if the file has staged changes (index status X)
if (indexStatus !== ' ' && indexStatus !== '?') {
stagedFiles.push(file.path);
}
// Check for working tree changes (worktree status Y): handles MM, AM, MD, etc.
// Check for working tree changes (worktree status Y): handles MM, MD, etc.
if (workTreeStatus !== ' ' && workTreeStatus !== '?') {
trackedModified.push(file.path);
}