beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[repo] Always commit before rebasing fetched changes in case something changed

Browse source
This commit is contained in:
Hylke Bons 2011-02-23 00:09:44 +00:00
parent 43290d387e
commit 60b77c5fa1
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SparkleLib/SparkleRepo.cs
View file

@ -565,13 +565,13 @@ namespace SparkleLib {
LocalTimer.Stop (); LocalTimer.Stop ();
RemoteTimer.Stop (); RemoteTimer.Stop ();
Add (); if (RepositoryStatus.AnyDifferences) {
string message = FormatCommitMessage (); Add ();
if (message != null) { string message = FormatCommitMessage ();
Commit (message); Commit (message);
CheckForRemoteChanges (); CheckForRemoteChanges ();
Push (); Push ();
@ -745,9 +745,14 @@ namespace SparkleLib {
// Merges the fetched changes // Merges the fetched changes
public void Rebase () public void Rebase ()
{ {
if (RepositoryStatus.AnyDifferences) {
Add ();
Commit ();
Add (); }
Watcher.EnableRaisingEvents = false; Watcher.EnableRaisingEvents = false;
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes..."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes...");