Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add SparkleShare.txt and .sparkleshare in a single commit
  • Loading branch information
hbons committed Apr 26, 2012
1 parent c477b45 commit ede2f02
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
10 changes: 0 additions & 10 deletions SparkleLib/Git/SparkleRepoGit.cs
Expand Up @@ -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.
//
Expand Down
4 changes: 2 additions & 2 deletions SparkleLib/SparkleRepoBase.cs
Expand Up @@ -165,10 +165,10 @@ public SparkleRepoBase (string path)
this.status = status;
};

this.identifier = Identifier;

if (CurrentRevision == null)
CreateInitialChangeSet ();

this.identifier = Identifier;


CreateWatcher ();
Expand Down
1 change: 1 addition & 0 deletions SparkleShare/SparkleSetupController.cs
Expand Up @@ -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) {

Expand Down

0 comments on commit ede2f02

Please sign in to comment.