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

fix crash if file was renamed remote

Browse source 
see #8 (https://github.com/wimh/SparkleShare/issues/8)
This commit is contained in:
wimh 2011-08-26 22:00:33 +02:00
parent 77caf67a8d
commit 0a9aaff4b8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -494,7 +494,8 @@ namespace SparkleLib {
if ((change_set.Added.Count +
change_set.Edited.Count +
change_set.Deleted.Count) > 0) {
change_set.Deleted.Count +
change_set.MovedFrom.Count) > 0) {
change_set.Notes.AddRange (GetNotes (change_set.Revision));
change_sets.Add (change_set);

9
SparkleLib/SparkleRepoBase.cs
View file

@ -442,8 +442,13 @@ namespace SparkleLib {
if (SyncStatusChanged != null)
SyncStatusChanged (SyncStatus.Idle);
if (NewChangeSet != null)
NewChangeSet (GetChangeSets (1) [0], LocalPath);
List<SparkleChangeSet> change_sets = GetChangeSets (1);
if (change_sets != null && change_sets.Count > 0) {
SparkleChangeSet change_set = change_sets [0];
if (NewChangeSet != null)
NewChangeSet (change_set, LocalPath);
}
// There could be changes from a
// resolved conflict. Tries only once,