michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enhance: do not call git add before git stash push when enable auto stash in checkout/create branch/pull (#316)

Browse source
This commit is contained in:
leo 2024-08-07 15:20:21 +08:00
parent 6c5175704e
commit 71c2ad989b
No known key found for this signature in database
4 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ViewModels/Checkout.cs
View file

@ -35,15 +35,9 @@ namespace SourceGit.ViewModels
if (hasLocalChanges) if (hasLocalChanges)
{ {
if (PreAction == Models.DealWithLocalChanges.StashAndReaply) if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
{
SetProgressDescription("Adding untracked changes ...");
var succ = new Commands.Add(_repo.FullPath).Exec();
if (succ)
{ {
SetProgressDescription("Stash local changes ..."); SetProgressDescription("Stash local changes ...");
succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH"); var succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
}
if (!succ) if (!succ)
{ {
CallUIThread(() => _repo.SetWatcherEnabled(true)); CallUIThread(() => _repo.SetWatcherEnabled(true));

8
src/ViewModels/CheckoutCommit.cs
View file

@ -39,15 +39,9 @@ namespace SourceGit.ViewModels
if (HasLocalChanges) if (HasLocalChanges)
{ {
if (AutoStash) if (AutoStash)
{
SetProgressDescription("Adding untracked changes ...");
var succ = new Commands.Add(_repo.FullPath).Exec();
if (succ)
{ {
SetProgressDescription("Stash local changes ..."); SetProgressDescription("Stash local changes ...");
succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH"); var succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
}
if (!succ) if (!succ)
{ {
CallUIThread(() => _repo.SetWatcherEnabled(true)); CallUIThread(() => _repo.SetWatcherEnabled(true));

8
src/ViewModels/CreateBranch.cs
View file

@ -90,15 +90,9 @@ namespace SourceGit.ViewModels
if (_repo.WorkingCopyChangesCount > 0) if (_repo.WorkingCopyChangesCount > 0)
{ {
if (PreAction == Models.DealWithLocalChanges.StashAndReaply) if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
{
SetProgressDescription("Adding untracked changes...");
var succ = new Commands.Add(_repo.FullPath).Exec();
if (succ)
{ {
SetProgressDescription("Stash local changes"); SetProgressDescription("Stash local changes");
succ = new Commands.Stash(_repo.FullPath).Push("CREATE_BRANCH_AUTO_STASH"); var succ = new Commands.Stash(_repo.FullPath).Push("CREATE_BRANCH_AUTO_STASH");
}
if (!succ) if (!succ)
{ {
CallUIThread(() => _repo.SetWatcherEnabled(true)); CallUIThread(() => _repo.SetWatcherEnabled(true));

8
src/ViewModels/Pull.cs
View file

@ -133,15 +133,9 @@ namespace SourceGit.ViewModels
if (_repo.WorkingCopyChangesCount > 0) if (_repo.WorkingCopyChangesCount > 0)
{ {
if (PreAction == Models.DealWithLocalChanges.StashAndReaply) if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
{
SetProgressDescription("Adding untracked changes...");
var succ = new Commands.Add(_repo.FullPath).Exec();
if (succ)
{ {
SetProgressDescription("Stash local changes..."); SetProgressDescription("Stash local changes...");
succ = new Commands.Stash(_repo.FullPath).Push("PULL_AUTO_STASH"); var succ = new Commands.Stash(_repo.FullPath).Push("PULL_AUTO_STASH");
}
if (!succ) if (!succ)
{ {
CallUIThread(() => _repo.SetWatcherEnabled(true)); CallUIThread(() => _repo.SetWatcherEnabled(true));