enhance: allow edit commit message only with Amend (#336)

This commit is contained in:
leo 2024-08-08 15:18:35 +08:00
parent 97d5ecdfe9
commit eb441852b0
No known key found for this signature in database

View file

@ -1239,24 +1239,32 @@ namespace SourceGit.ViewModels
return; return;
} }
if (_count == 0)
{
App.RaiseException(_repo.FullPath, "No files added to commit!");
return;
}
if (!AutoStageBeforeCommit && _staged.Count == 0)
{
App.RaiseException(_repo.FullPath, "No files added to commit!");
return;
}
if (string.IsNullOrWhiteSpace(_commitMessage)) if (string.IsNullOrWhiteSpace(_commitMessage))
{ {
App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!"); App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!");
return; return;
} }
if (!_useAmend)
{
if (AutoStageBeforeCommit)
{
if (_count == 0)
{
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;
}
}
}
IsCommitting = true; IsCommitting = true;
_repo.Settings.PushCommitMessage(_commitMessage); _repo.Settings.PushCommitMessage(_commitMessage);
_repo.SetWatcherEnabled(false); _repo.SetWatcherEnabled(false);