michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -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

10
src/ViewModels/Checkout.cs
View file

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

10
src/ViewModels/CheckoutCommit.cs
View file

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

10
src/ViewModels/CreateBranch.cs
View file

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

10
src/ViewModels/Pull.cs
View file

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