Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 16b6499

Browse files
authored
Merge branch 'master' into fixes/mac-stranger-things
2 parents 2bb7433 + d925d43 commit 16b6499

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,15 @@ private async Task SetupGit()
6464
if (Environment.IsWindows)
6565
{
6666
var credentialHelper = await GitClient.GetConfig("credential.helper", GitConfigSource.Global).StartAwait();
67-
if (string.IsNullOrEmpty(credentialHelper))
67+
68+
if (!string.IsNullOrEmpty(credentialHelper))
69+
{
70+
Logger.Trace("Windows CredentialHelper: {0}", credentialHelper);
71+
}
72+
else
6873
{
74+
Logger.Warning("No Windows CredentialHeloper found: Setting to wincred");
75+
6976
await GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global).StartAwait();
7077
}
7178
}

src/GitHub.Api/Git/GitCredentialManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ private async Task<bool> LoadCredentialHelper()
133133
.Configure(processManager)
134134
.StartAwait();
135135

136+
Logger.Trace("Loaded Credential Helper: {0}", credHelper);
137+
136138
if (credHelper != null)
137139
{
138140
return true;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class BranchesView : Subview
5252
[SerializeField] private List<Remote> remotes = new List<Remote>();
5353
[SerializeField] private Vector2 scroll;
5454
[SerializeField] private BranchTreeNode selectedNode;
55-
private List<string> favoritesList;
55+
[SerializeField] private List<string> favoritesList = new List<string>();
5656

5757
public override void InitializeView(IView parent)
5858
{

0 commit comments

Comments
 (0)