Fixes apply with deleted (added) file

gitkraken · Feb 27, 2025 · 01d2c0d · 01d2c0d
1 parent dee9185
commit 01d2c0d
Showing 1 changed file with 2 additions and 2 deletions.
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];
 			}
 		}
 	}