Merge branch 'fixes/settings-view-git-remote-update' into fixes/name-email-update

StanleyGoldman · StanleyGoldman · commit 14cc5f93e4bc · 2017-08-08T10:22:41.000-04:00
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
@@ -240,7 +240,8 @@ public ConfigRemote? CurrentRemote
             Name,
             CloneUrl,
             LocalPath,
-            GetHashCode());
+            CurrentBranch,
+            CurrentRemote);
 
         public GitStatus CurrentStatus
         {
diff --git a/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs b/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs
@@ -62,7 +62,7 @@ public async Task ShouldDetectFileChanges()
             result.AssertEqual(expected);
         }
 
-        [Test]
+        [Test, Category("TimeSensitive")]
         public async Task ShouldAddAndCommitFiles()
         {
             await Initialize(TestRepoMasterCleanSynchronized);

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,8 @@ public ConfigRemote? CurrentRemote`
`240`	`240`	`Name,`
`241`	`241`	`CloneUrl,`
`242`	`242`	`LocalPath,`
`243`		`- GetHashCode());`
	`243`	`+ CurrentBranch,`
	`244`	`+ CurrentRemote);`
`244`	`245`
`245`	`246`	`public GitStatus CurrentStatus`
`246`	`247`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public async Task ShouldDetectFileChanges()`
`62`	`62`	`result.AssertEqual(expected);`
`63`	`63`	`}`
`64`	`64`
`65`		`- [Test]`
	`65`	`+ [Test, Category("TimeSensitive")]`
`66`	`66`	`public async Task ShouldAddAndCommitFiles()`
`67`	`67`	`{`
`68`	`68`	`await Initialize(TestRepoMasterCleanSynchronized);`