dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-07 20:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

enhance: unstaged renamed file should use git restore --staged <path> <org_path> instead of git restore --staged <path>

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-01 11:19:41 +08:00
parent 6620bd193e
commit fa004ce31b
No known key found for this signature in database
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Commands/Restore.cs
View file

@ -21,7 +21,7 @@ namespace SourceGit.Commands
WorkingDirectory = repo; WorkingDirectory = repo;
Context = repo; Context = repo;
StringBuilder builder = new StringBuilder(); var builder = new StringBuilder();
builder.Append("restore "); builder.Append("restore ");
if (!string.IsNullOrEmpty(extra)) if (!string.IsNullOrEmpty(extra))
builder.Append(extra).Append(" "); builder.Append(extra).Append(" ");

4
src/ViewModels/WorkingCopy.cs
View file

@ -1675,7 +1675,11 @@ namespace SourceGit.ViewModels
var step = changes.GetRange(i, Math.Min(10, count - i)); var step = changes.GetRange(i, Math.Min(10, count - i));
var files = new List<string>(); var files = new List<string>();
foreach (var c in step) foreach (var c in step)
{
files.Add(c.Path); files.Add(c.Path);
if (c.Index == Models.ChangeState.Renamed)
files.Add(c.OriginalPath);
}
await Task.Run(() => new Commands.Restore(_repo.FullPath, files, "--staged").Use(log).Exec()); await Task.Run(() => new Commands.Restore(_repo.FullPath, files, "--staged").Use(log).Exec());
} }