[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 ();
|
LocalTimer.Stop ();
|
||||||
RemoteTimer.Stop ();
|
RemoteTimer.Stop ();
|
||||||
|
|
||||||
|
if (RepositoryStatus.AnyDifferences) {
|
||||||
|
|
||||||
Add ();
|
Add ();
|
||||||
|
|
||||||
string message = FormatCommitMessage ();
|
string message = FormatCommitMessage ();
|
||||||
|
|
||||||
if (message != null) {
|
|
||||||
|
|
||||||
Commit (message);
|
Commit (message);
|
||||||
|
|
||||||
CheckForRemoteChanges ();
|
CheckForRemoteChanges ();
|
||||||
Push ();
|
Push ();
|
||||||
|
|
||||||
|
@ -746,7 +746,12 @@ namespace SparkleLib {
|
||||||
public void Rebase ()
|
public void Rebase ()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if (RepositoryStatus.AnyDifferences) {
|
||||||
|
|
||||||
Add ();
|
Add ();
|
||||||
|
Commit ();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
Watcher.EnableRaisingEvents = false;
|
Watcher.EnableRaisingEvents = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue