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

feature: allow empty commit (#587)

Browse source
This commit is contained in:
leo 2024-10-22 10:03:38 +08:00
parent a8a7775b83
commit 1855b43750
No known key found for this signature in database
8 changed files with 147 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ViewModels/WorkingCopy.cs
View file

@ -410,17 +410,22 @@ namespace SourceGit.ViewModels
public void Commit()
{
DoCommit(false, false);
DoCommit(false, false, false);
}
public void CommitWithAutoStage()
{
DoCommit(true, false);
DoCommit(true, false, false);
}
public void CommitWithPush()
{
DoCommit(false, true);
DoCommit(false, true, false);
}
public void CommitWithoutFiles(bool autoPush)
{
DoCommit(false, autoPush, true);
}
public ContextMenu CreateContextMenuForUnstagedChanges()
@ -1268,7 +1273,7 @@ namespace SourceGit.ViewModels
_repo.SetWatcherEnabled(true);
}
private void DoCommit(bool autoStage, bool autoPush)
private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty)
{
if (!PopupHost.CanCreatePopup())
{
@ -1282,23 +1287,16 @@ namespace SourceGit.ViewModels
return;
}
if (!_useAmend)
if (!_useAmend && !allowEmpty)
{
if (autoStage)
if ((autoStage && _count == 0) || (!autoStage && _staged.Count == 0))
{
if (_count == 0)
App.OpenDialog(new Views.ConfirmCommitWithoutFiles()
{
App.RaiseException(_repo.FullPath, "No files added to commit!");
return;
}
}
else
{
if (_staged.Count == 0)
{
App.RaiseException(_repo.FullPath, "No files added to commit!");
return;
}
DataContext = new ConfirmCommitWithoutFiles(this, autoPush)
});
return;
}
}
@ -1313,7 +1311,7 @@ namespace SourceGit.ViewModels
succ = new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Exec();
if (succ)
succ = new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend).Exec();
succ = new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend, true).Exec();
Dispatcher.UIThread.Post(() =>
{