Hotfix in restore discard history of files with same name

atom · May 8, 2021 · 7890946 · 7890946
1 parent 853ea19
commit 7890946
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/models/discard-history.js b/lib/models/discard-history.js
@@ -127,7 +127,7 @@ export default class DiscardHistory {
         await this.expandBlobToFile(path.join(tempFolderPath, `${filePath}-before-discard`), beforeSha);
       const commonBasePath = !afterSha ? null :
         await this.expandBlobToFile(path.join(tempFolderPath, `${filePath}-after-discard`), afterSha);
-      const resultPath = path.join(tempFolderPath, `~${path.basename(filePath)}-merge-result`);
+      const resultPath = path.join(tempFolderPath, path.dirname(filePath), `~${path.basename(filePath)}-merge-result`);
       return {filePath, commonBasePath, theirsPath, resultPath, theirsSha: beforeSha, commonBaseSha: afterSha};
     });
     return await Promise.all(pathPromises);