[repo] Always commit before rebasing fetched changes in case something changed
This commit is contained in:
parent
ad2c87356f
commit
d07d6c71cd
|
@ -565,13 +565,13 @@ namespace SparkleLib {
|
|||
LocalTimer.Stop ();
|
||||
RemoteTimer.Stop ();
|
||||
|
||||
Add ();
|
||||
if (RepositoryStatus.AnyDifferences) {
|
||||
|
||||
string message = FormatCommitMessage ();
|
||||
|
||||
if (message != null) {
|
||||
Add ();
|
||||
|
||||
string message = FormatCommitMessage ();
|
||||
Commit (message);
|
||||
|
||||
CheckForRemoteChanges ();
|
||||
Push ();
|
||||
|
||||
|
@ -746,7 +746,12 @@ namespace SparkleLib {
|
|||
public void Rebase ()
|
||||
{
|
||||
|
||||
Add ();
|
||||
if (RepositoryStatus.AnyDifferences) {
|
||||
|
||||
Add ();
|
||||
Commit ();
|
||||
|
||||
}
|
||||
|
||||
Watcher.EnableRaisingEvents = false;
|
||||
|
||||
|
|
Loading…
Reference in a new issue