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

git fetcher: Fix resolving conflicts in encrypted files

Browse source
This commit is contained in:
Hylke Bons 2016-06-18 15:25:54 -07:00 committed by Hylke Bons
parent 75062a12f3
commit e5f109eddb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sparkles/Git/GitFetcher.cs
View file

@ -357,7 +357,7 @@ namespace Sparkles.Git {
// Pass all files through the encryption filter
// TODO: diff=encryption merge=encryption -text?
string git_attributes_file_path = Path.Combine (TargetFolder, ".git", "info", "attributes");
File.WriteAllText (git_attributes_file_path, "* filter=encryption diff=encryption merge=encryption -text");
File.WriteAllText (git_attributes_file_path, "* filter=encryption -diff merge=binary");
// Store the password
string password_file_path = Path.Combine (TargetFolder, ".git", "info", "encryption_password");