Skip to content

Commit c5e0e09

Browse files
committed
Close #1200. Also catch exception.
1 parent 28616fb commit c5e0e09

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,20 @@ private void InitRepo()
590590
}
591591

592592
Logger.Trace("Initializing repo");
593-
_provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject);
594-
var repo = _provider.InitVBAProject(folderPicker.SelectedPath);
595-
Provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject, repo, _wrapperFactory);
596593

597-
AddOrUpdateLocalPathConfig((Repository)repo);
594+
try
595+
{
596+
_provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject);
597+
var repo = _provider.InitVBAProject(folderPicker.SelectedPath);
598+
Provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject, repo, _wrapperFactory);
599+
600+
AddOrUpdateLocalPathConfig((Repository) repo);
601+
}
602+
catch (SourceControlException ex)
603+
{
604+
ViewModel_ErrorThrown(this, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
605+
}
606+
598607
Status = RubberduckUI.Online;
599608
}
600609
}
@@ -703,7 +712,7 @@ private void CloneRepo(SecureCredentials credentials = null)
703712
_isCloning = false;
704713
}
705714

706-
ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
715+
ViewModel_ErrorThrown(this, new ErrorEventArgs(ex.Message, ex.InnerException.Message, NotificationType.Error));
707716
return;
708717
}
709718

Rubberduck.SourceControl/Commit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public Commit(string id, string author, string message)
1717
{
1818
Id = id;
1919
Author = author;
20-
Message = message;
20+
Message = message.Trim();
2121
}
2222

2323
public Commit(LibGit2Sharp.Commit commit)

0 commit comments

Comments
 (0)