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

fetcher git: Treat all files as binary

Browse source
This commit is contained in:
Hylke Bons 2016-06-19 21:02:59 -07:00 committed by Hylke Bons
parent a7ff610aa7
commit b6fe147df6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Sparkles/Git/GitFetcher.cs
View file

@ -442,6 +442,9 @@ namespace Sparkles.Git {
string attribute_rules_file_path = Path.Combine (TargetFolder, ".git", "info", "attributes"); string attribute_rules_file_path = Path.Combine (TargetFolder, ".git", "info", "attributes");
TextWriter writer = new StreamWriter (attribute_rules_file_path); TextWriter writer = new StreamWriter (attribute_rules_file_path);
// Treat all files as binary as we always want to keep both file versions on a conflict
writer.WriteLine ("* merge=binary");
// Compile a list of files we don't want Git to compress. Not compressing // Compile a list of files we don't want Git to compress. Not compressing
// already compressed files decreases memory usage and increases speed // already compressed files decreases memory usage and increases speed
string [] extensions = { string [] extensions = {
@ -452,12 +455,10 @@ namespace Sparkles.Git {
}; };
foreach (string extension in extensions) { foreach (string extension in extensions) {
writer.WriteLine ("*." + extension + " -delta"); writer.WriteLine ("*." + extension + " -delta merge=binary");
writer.WriteLine ("*." + extension.ToUpper () + " -delta"); writer.WriteLine ("*." + extension.ToUpper () + " -delta merge=binary");
} }
writer.WriteLine ("*.txt text");
writer.WriteLine ("*.TXT text");
writer.Close (); writer.Close ();
} }