Merge branch 'master' into fixes/cache-update-event

Author: StanleyGoldman

src/GitHub.Api/Git/GitConfig.cs

@@ -50,11 +50,11 @@ public ConfigBranch(string name, ConfigRemote? remote)
             this.remote = remote ?? ConfigRemote.Default;
         }
 
-        public bool IsTracking => !remote.Equals(ConfigRemote.Default);
+        public bool IsTracking => Remote.HasValue;
 
         public string Name => name;
 
-        public ConfigRemote? Remote => remote;
+        public ConfigRemote? Remote => Equals(remote, ConfigRemote.Default) ? (ConfigRemote?) null : remote;
 
         public override string ToString()
         {

src/GitHub.Api/Git/Repository.cs

@@ -646,6 +646,7 @@ public void Initialize(IGitClient client)
             Logger.Trace("Initialize");
 
             gitClient = client;
+            cacheContainer.GitUserCache.ValidateData();
         }
 
         public void SetNameAndEmail(string name, string email)
@@ -699,20 +700,23 @@ private void HandleUserCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
 
         private void UpdateUserAndEmail()
         {
-            if (gitClient != null)
-            {
-                Logger.Trace("UpdateUserAndEmail");
+            Logger.Trace("UpdateUserAndEmail");
 
-                gitClient.GetConfigUserAndEmail()
-                    .ThenInUI((success, value) =>
-                    {
-                        if (success)
-                        {
-                            Name = value.Name;
-                            Email = value.Email;
-                        }
-                    }).Start();
+            if (gitClient == null)
+            {
+                Logger.Trace("GitClient is null");
+                return;
             }
+
+            gitClient.GetConfigUserAndEmail()
+                     .ThenInUI((success, value) =>
+                     {
+                         if (success)
+                         {
+                             Name = value.Name;
+                             Email = value.Email;
+                         }
+                     }).Start();
         }
 
         protected static ILogging Logger { get; } = Logging.GetLogger<User>();

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

@@ -148,13 +148,10 @@ private bool ValidateInitialized()
             var notInitialized = ApplicationCache.Instance.FirstRunAt > InitializedAt;
             if (notInitialized)
             {
-                Logger.Trace("Initialized");
-                InitializedAt = DateTimeOffset.Now;
-                Save(true);
+                Logger.Trace("Not Initialized");
 
                 if (invalidOnFirstRun)
                 {
-                    Logger.Trace("FirstRun Invalidation");
                     InvalidateData();
                 }
             }
@@ -166,11 +163,15 @@ public void InvalidateData()
         {
             Logger.Trace("Invalidate");
             CacheInvalidated.SafeInvoke();
-            SaveData(DateTimeOffset.Now, false);
         }
 
         protected void SaveData(DateTimeOffset now, bool isUpdated)
         {
+            if (InitializedAt == DateTimeOffset.MinValue)
+            {
+                InitializedAt = now;
+            }
+
             if (isUpdated)
             {
                 LastUpdatedAt = now;