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

fetcher git: explicitly set the push strategy. fixes #1035

Browse source
This commit is contained in:
Hylke Bons 2012-10-26 13:43:54 +01:00
parent 3001e1c2c1
commit d79f093996
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SparkleLib/Git/SparkleFetcherGit.cs
View file

@ -338,7 +338,8 @@ namespace SparkleLib.Git {
"core.packedGitWindowSize 128m", "core.packedGitWindowSize 128m",
"pack.deltaCacheSize 128m", "pack.deltaCacheSize 128m",
"pack.packSizeLimit 128m", "pack.packSizeLimit 128m",
"pack.windowMemory 128m" "pack.windowMemory 128m",
"push.default matching"
}; };
foreach (string setting in settings) { foreach (string setting in settings) {

2
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -163,7 +163,7 @@ namespace SparkleLib.Git {
string remote_revision = output.Substring (0, 40); string remote_revision = output.Substring (0, 40);
if (!remote_revision.StartsWith (current_revision)) { if (!string.IsNullOrEmpty (remote_revision) && !remote_revision.StartsWith (current_revision)) {
SparkleLogger.LogInfo ("Git", Name + " | Remote changes found, local: " + SparkleLogger.LogInfo ("Git", Name + " | Remote changes found, local: " +
current_revision + ", remote: " + remote_revision); current_revision + ", remote: " + remote_revision);

2
SparkleLib/SparkleRepoBase.cs
View file

@ -227,7 +227,7 @@ namespace SparkleLib {
} }
lock (this.buffer_lock) { lock (this.buffer_lock) {
if (IsBuffering || !HasLocalChanges) if (IsBuffering || this.is_syncing || !HasLocalChanges)
return; return;
IsBuffering = true; IsBuffering = true;