Hotfix in restore discard history of files with same name#2676
Hotfix in restore discard history of files with same name#2676smashwilson merged 2 commits intoatom:masterfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2676 +/- ##
==========================================
- Coverage 93.46% 93.46% -0.01%
==========================================
Files 237 237
Lines 13213 13213
Branches 1900 1900
==========================================
- Hits 12350 12349 -1
- Misses 863 864 +1
Continue to review full report at Codecov.
|
|
The test failures seem to be unrelated so I'm not particularly concerned about those. But I think this isn't sufficient yet - I traced through and found a place where github/lib/git-shell-out-strategy.js Line 1109 in 853ea19 I believe we'll also need to add calls to Unfortunately |
|
The directory should exist, as it is created a few lines before the resultPath is declared. github/lib/models/discard-history.js Line 125 in 7890946 I will update the code to reflect by joining with the dir variable. I may look into creating tests at another time. |
|
Oh! Right you are. Works for me 👍🏻 |
Description of the Change
This hotfix restores the discard history of two files with the same name correctly by including the directory of the file in the result path.
Screenshot or Gif
N/A
Applicable Issues
Fixes #2172