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

refactor: do not run git add for untracked file while stashing local changes (#903)

Browse source
This commit is contained in:
leo 2025-01-14 17:10:06 +08:00
parent d8168c3ba6
commit cc5f3ebfa5
No known key found for this signature in database
6 changed files with 56 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/ViewModels/StashChanges.cs
View file

@ -76,14 +76,11 @@ namespace SourceGit.ViewModels
}
else
{
if (IncludeUntracked)
AddUntracked(_changes);
succ = StashWithChanges(_changes);
succ = new Commands.Stash(_repo.FullPath).Push(Message, IncludeUntracked, KeepIndex);
}
}
else
{
AddUntracked(_changes);
succ = StashWithChanges(_changes);
}
@ -97,40 +94,6 @@ namespace SourceGit.ViewModels
});
}
private void AddUntracked(List<Models.Change> changes)
{
var toBeAdded = new List<Models.Change>();
foreach (var c in changes)
{
if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked)
toBeAdded.Add(c);
}
if (toBeAdded.Count == 0)
return;
if (Native.OS.GitVersion >= Models.GitVersions.ADD_WITH_PATHSPECFILE)
{
var paths = new List<string>();
foreach (var c in toBeAdded)
paths.Add(c.Path);
var tmpFile = Path.GetTempFileName();
File.WriteAllLines(tmpFile, paths);
new Commands.Add(_repo.FullPath, tmpFile).Exec();
File.Delete(tmpFile);
}
else
{
for (int i = 0; i < toBeAdded.Count; i += 10)
{
var count = Math.Min(10, toBeAdded.Count - i);
var step = toBeAdded.GetRange(i, count);
new Commands.Add(_repo.FullPath, step).Exec();
}
}
}
private bool StashWithChanges(List<Models.Change> changes)
{
if (changes.Count == 0)