fix restore behavior of "discard changes"

letmaik · Aug 5, 2023 · a26e916 · a26e916
1 parent d7d1016
commit a26e916
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.15.1
+
+* Fixed "Discard Changes" incorrectly restoring files to base ref instead of merge base 
+
 ## 1.15.0
 
 * Added "Discard Changes" button to restore files with contents from the base ref [#90](https://github.com/letmaik/vscode-git-tree-compare/issues/90)

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "git-tree-compare",
     "displayName": "Git Tree Compare",
     "description": "Diff your worktree against a branch, tag, or commit in a tree -- especially useful for pull request preparation or merge preview",
-    "version": "1.15.0",
+    "version": "1.15.1",
     "author": {
         "name": "Maik Riechert",
         "url": "https://github.com/letmaik"

diff --git a/src/treeProvider.ts b/src/treeProvider.ts
@@ -883,7 +883,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
                 }
                 prompts.push([msg, 'Restore File']);
                 actions.push(async () => {
-                    await this.repository!.checkout(this.baseRef, [diffStatus.dstAbsPath]);
+                    await this.repository!.checkout(this.mergeBase, [diffStatus.dstAbsPath]);
                 });
             } else if (diffStatus.status === 'R') {
                 const srcFolder = path.dirname(diffStatus.srcAbsPath);
@@ -910,7 +910,7 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
                 prompts.push([msg, 'Restore File']);
                 actions.push(async () => {
                     await rmFile(this.repository!, diffStatus.dstAbsPath);
-                    await this.repository!.checkout(this.baseRef, [diffStatus.srcAbsPath]);
+                    await this.repository!.checkout(this.mergeBase, [diffStatus.srcAbsPath]);
                 });
             } else {
                 window.showInformationMessage(