Skip to content

Commit 0add765

Browse files
committed
Don't let repos without branches crash things.
1 parent 17f6a12 commit 0add765

File tree

4 files changed

+32
-1
lines changed

4 files changed

+32
-1
lines changed

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,4 +1414,10 @@ All our stargazers, likers & followers, for the warm fuzzies
14141414
<data name="SourceControl_UpdateSettingsTitle" xml:space="preserve">
14151415
<value>Settings updated</value>
14161416
</data>
1417+
<data name="SourceControl_NoBranchesMessage" xml:space="preserve">
1418+
<value>Repository does not contain any branches.</value>
1419+
</data>
1420+
<data name="SourceControl_NoBranchesTitle" xml:space="preserve">
1421+
<value>No branches found</value>
1422+
</data>
14171423
</root>

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,13 @@ private void InitRepo()
254254

255255
private void SetChildPresenterSourceControlProviders(ISourceControlProvider provider)
256256
{
257+
if (Provider.CurrentBranch == null)
258+
{
259+
ViewModel_ErrorThrown(null,
260+
new ErrorEventArgs(RubberduckUI.SourceControl_NoBranchesTitle, RubberduckUI.SourceControl_NoBranchesMessage));
261+
return;
262+
}
263+
257264
foreach (var tab in TabItems)
258265
{
259266
tab.ViewModel.Provider = provider;

Rubberduck.SourceControl/GitProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public override IBranch CurrentBranch
8181
{
8282
get
8383
{
84-
return Branches.First(b => !b.IsRemote && b.IsCurrentHead);
84+
return Branches.FirstOrDefault(b => !b.IsRemote && b.IsCurrentHead);
8585
}
8686
}
8787

0 commit comments

Comments
 (0)