Permalink
Browse files

Add SparkleShare.txt and .sparkleshare in a single commit

  • Loading branch information...
hbons committed Apr 22, 2012
1 parent c477b45 commit ede2f02274e6402714209ee31dd4427ae654a12f
Showing with 3 additions and 12 deletions.
  1. +0 −10 SparkleLib/Git/SparkleRepoGit.cs
  2. +2 −2 SparkleLib/SparkleRepoBase.cs
  3. +1 −0 SparkleShare/SparkleSetupController.cs
@@ -710,16 +710,6 @@ private void ResolveConflict ()
}
- public override void CreateInitialChangeSet ()
- {
- base.CreateInitialChangeSet ();
-
- Add ();
- string message = FormatCommitMessage ();
- Commit (message);
- }
-
-
// Git doesn't track empty directories, so this method
// fills them all with a hidden empty file.
//
@@ -165,10 +165,10 @@ public SparkleRepoBase (string path)
this.status = status;
};
+ this.identifier = Identifier;
+
if (CurrentRevision == null)
CreateInitialChangeSet ();
-
- this.identifier = Identifier;
CreateWatcher ();
@@ -189,6 +189,7 @@ public SparkleSetupController ()
}
if (this.current_page == PageType.Syncing ||
+ this.current_page == PageType.Finished ||
this.current_page == PageType.CryptoSetup ||
this.current_page == PageType.CryptoPassword) {

0 comments on commit ede2f02

Please sign in to comment.