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

Commit 3c13e7e

Browse files
committed
Merge fixes/732-git-config-on-startup into fixes/git-setup
2 parents bae457b + 3b212d6 commit 3c13e7e

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"md5":"108b2832cc3d1e6f1ffe792069ad3d21","url":"http://ghfvs-installer.github.com/unity/git/windows/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"executableMd5":"d0d59164a4b7b35685502d7c5f747f2f","version":"2.4.0"}
1+
{"md5":"c78270c2c94a4adce4beeef3010c732e","url":"http://ghfvs-installer.github.com/unity/git/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"version":"2.4.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:59a817fa5fa9cbd38eff9422eb576f31e3a225d5be387b292dc827faddfe785b
2+
oid sha256:d8d924dfef97d579305a485f30ad3866f775b295394be199eb487faca4357672
33
size 2831355

src/GitHub.Api/Primitives/Package.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static Package Load(IEnvironment environment, UriString packageFeed)
4343
if (!feed.IsInitialized)
4444
{
4545
// try from assembly resources
46-
feed = AssemblyResources.ToFile(ResourceType.Platform, packageFeed.Filename, environment.UserCachePath.Combine(packageFeed.Filename), environment);
46+
feed = AssemblyResources.ToFile(ResourceType.Platform, packageFeed.Filename, environment.UserCachePath, environment);
4747
}
4848

4949
if (feed.IsInitialized)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ public override void OnSelectionChange()
118118

119119
public override void OnFocusChanged()
120120
{
121-
Logger.Debug("OnFocusChanged: {0}", HasFocus);
122-
123121
base.OnFocusChanged();
124122
var hasFocus = HasFocus;
125123
if (treeChanges.ViewHasFocus != hasFocus)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public class UpdateCheckWindow : EditorWindow
6060

6161
public static void CheckForUpdates()
6262
{
63-
var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath);
63+
var download = new DownloadTask(TaskManager.Instance.Token, EntryPoint.Environment.FileSystem, UpdateFeedUrl, EntryPoint.Environment.UserCachePath)
64+
.Catch(e => true);
6465
download.OnEnd += (thisTask, result, success, exception) =>
6566
{
6667
if (success)

0 commit comments

Comments
 (0)