Fixes apply with deleted (added) file

eamodio · eamodio · commit 01d2c0de174a · 2025-02-26T19:36:45.000-05:00
diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts
@@ -71,8 +71,8 @@ export async function applyChanges(
 			} catch {
 				create = true;
 
-				ref2 = ref1;
-				ref1 = `${ref1}^`;
+				// If restoring a deleted file (e.g. a newly added file), swap the refs to restore from the previous commit
+				[ref1, ref2] = [ref2 === '' ? 'HEAD' : ref2 ?? `${ref1}^`, ref1];
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ export async function applyChanges(`
`71`	`71`	`} catch {`
`72`	`72`	`create = true;`
`73`	`73`
`74`		`- ref2 = ref1;`
`75`		- ref1 = `${ref1}^`;
	`74`	`+ // If restoring a deleted file (e.g. a newly added file), swap the refs to restore from the previous commit`
	`75`	+ [ref1, ref2] = [ref2 === '' ? 'HEAD' : ref2 ?? `${ref1}^`, ref1];
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`