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

Commit f38a3f8

Browse files
Merge branch 'master' into shana/thinking-about-auth
2 parents f9b3480 + 2b58acc commit f38a3f8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class EntryPoint : ScriptableObject
1818
// this may run on the loader thread if it's an appdomain restart
1919
static EntryPoint()
2020
{
21+
Logging.LoggerFactory = s => new UnityLogAdapter(s);
2122
if (System.Environment.GetEnvironmentVariable("GITHUB_UNITY_DISABLE") == "1")
2223
{
2324
Debug.Log("GitHub for Unity " + ApplicationInfo.Version + " is disabled");
@@ -29,7 +30,6 @@ static EntryPoint()
2930
return;
3031
}
3132
cctorCalled = true;
32-
Logging.LoggerFactory = s => new UnityLogAdapter(s);
3333
Logging.Info("Initializing GitHub for Unity version " + ApplicationInfo.Version);
3434

3535
ServicePointManager.ServerCertificateValidationCallback = ServerCertificateValidationCallback;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ private void OnCreateGUI()
464464
var cancelCreate = false;
465465
var cannotCreate = selectedNode == null ||
466466
selectedNode.Type == NodeType.Folder ||
467+
newBranchName == null ||
467468
!Utility.BranchNameRegex.IsMatch(newBranchName);
468469

469470
// Create on return/enter or cancel on escape

0 commit comments

Comments
 (0)