Remote.PushUrl defaults to Remote.Url

Ryan Roden-Corrent · Ryan Roden-Corrent · commit 63afd18a0bf9 · 2015-02-23T11:34:02.000-05:00
diff --git a/LibGit2Sharp.Tests/RemoteFixture.cs b/LibGit2Sharp.Tests/RemoteFixture.cs
@@ -91,6 +91,8 @@ public void CanSetRemoteUrl()
                     r => r.Url = newUrl);
 
                 Assert.Equal(newUrl, updatedremote.Url);
+                // with no push url set, PushUrl defaults to the fetch url
+                Assert.Equal(newUrl, updatedremote.PushUrl);
             }
         }
 
@@ -111,6 +113,8 @@ public void CanSetRemotePushUrl()
                 Remote updatedremote = repo.Network.Remotes.Update(remote,
                     r => r.PushUrl = pushurl);
 
+                // url should not change, push url should be set to new value
+                Assert.Equal(url, updatedremote.Url);
                 Assert.Equal(pushurl, updatedremote.PushUrl);
             }
         }
diff --git a/LibGit2Sharp/Remote.cs b/LibGit2Sharp/Remote.cs
@@ -20,6 +20,7 @@ public class Remote : IEquatable<Remote>, IBelongToARepository
         internal readonly Repository repository;
 
         private readonly RefSpecCollection refSpecs;
+        private string pushUrl;
 
         /// <summary>
         /// Needed for mocking purposes.
@@ -56,9 +57,18 @@ internal static Remote BuildFromPtr(RemoteSafeHandle handle, Repository repo)
 
         /// <summary>
         /// Gets the distinct push url for this remote repository, if set.
-        /// If no separate push url is specified, PushUrl is null.
+        /// Defaults to the fetch url (<see cref="Url"/>) if not set.
         /// </summary>
-        public virtual string PushUrl { get; private set; }
+        public virtual string PushUrl {
+            get
+            {
+                return pushUrl ?? Url;
+            }
+            private set
+            {
+                pushUrl = value;
+            }
+        }
 
         /// <summary>
         /// Gets the Tag Fetch Mode of the remote - indicating how tags are fetched.

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@ public void CanSetRemoteUrl()`
`91`	`91`	`r => r.Url = newUrl);`
`92`	`92`
`93`	`93`	`Assert.Equal(newUrl, updatedremote.Url);`
	`94`	`+ // with no push url set, PushUrl defaults to the fetch url`
	`95`	`+ Assert.Equal(newUrl, updatedremote.PushUrl);`
`94`	`96`	`}`
`95`	`97`	`}`
`96`	`98`
`@@ -111,6 +113,8 @@ public void CanSetRemotePushUrl()`
`111`	`113`	`Remote updatedremote = repo.Network.Remotes.Update(remote,`
`112`	`114`	`r => r.PushUrl = pushurl);`
`113`	`115`
	`116`	`+ // url should not change, push url should be set to new value`
	`117`	`+ Assert.Equal(url, updatedremote.Url);`
`114`	`118`	`Assert.Equal(pushurl, updatedremote.PushUrl);`
`115`	`119`	`}`
`116`	`120`	`}`