@@ -683,10 +683,12 @@ public void CanSetTrackedBranch()
683
683
string path = SandboxStandardTestRepo ( ) ;
684
684
using ( var repo = new Repository ( path ) )
685
685
{
686
- Branch branch = repo . CreateBranch ( testBranchName ) ;
686
+ Branch trackedBranch = repo . Branches [ trackedBranchName ] ;
687
+ Assert . True ( trackedBranch . IsRemote ) ;
688
+
689
+ Branch branch = repo . CreateBranch ( testBranchName , trackedBranch . Tip ) ;
687
690
Assert . False ( branch . IsTracking ) ;
688
691
689
- Branch trackedBranch = repo . Branches [ trackedBranchName ] ;
690
692
repo . Branches . Update ( branch ,
691
693
b => b . TrackedBranch = trackedBranch . CanonicalName ) ;
692
694
@@ -743,10 +745,12 @@ public void CanSetUpstreamBranch()
743
745
string path = SandboxStandardTestRepo ( ) ;
744
746
using ( var repo = new Repository ( path ) )
745
747
{
746
- Branch branch = repo . CreateBranch ( testBranchName ) ;
748
+ Branch trackedBranch = repo . Branches [ trackedBranchName ] ;
749
+ Assert . True ( trackedBranch . IsRemote ) ;
750
+
751
+ Branch branch = repo . CreateBranch ( testBranchName , trackedBranch . Tip ) ;
747
752
Assert . False ( branch . IsTracking ) ;
748
753
749
- Branch trackedBranch = repo . Branches [ trackedBranchName ] ;
750
754
Branch updatedBranch = repo . Branches . Update ( branch ,
751
755
b => b . Remote = remoteName ,
752
756
b => b . UpstreamBranch = upstreamBranchName ) ;
@@ -773,10 +777,11 @@ public void CanSetLocalTrackedBranch()
773
777
string path = SandboxStandardTestRepo ( ) ;
774
778
using ( var repo = new Repository ( path ) )
775
779
{
776
- Branch branch = repo . CreateBranch ( testBranchName ) ;
777
- Assert . False ( branch . IsTracking ) ;
778
-
779
780
Branch trackedBranch = repo . Branches [ localTrackedBranchName ] ;
781
+ Assert . False ( trackedBranch . IsRemote ) ;
782
+
783
+ Branch branch = repo . CreateBranch ( testBranchName , trackedBranch . Tip ) ;
784
+ Assert . False ( branch . IsTracking ) ;
780
785
781
786
repo . Branches . Update ( branch ,
782
787
b => b . TrackedBranch = trackedBranch . CanonicalName ) ;
@@ -811,11 +816,13 @@ public void CanUnsetTrackedBranch()
811
816
string path = SandboxStandardTestRepo ( ) ;
812
817
using ( var repo = new Repository ( path ) )
813
818
{
814
- Branch branch = repo . CreateBranch ( testBranchName ) ;
819
+ Branch trackedBranch = repo . Branches [ trackedBranchName ] ;
820
+
821
+ Branch branch = repo . CreateBranch ( testBranchName , trackedBranch . Tip ) ;
815
822
Assert . False ( branch . IsTracking ) ;
816
823
817
824
branch = repo . Branches . Update ( branch ,
818
- b => b . TrackedBranch = trackedBranchName ) ;
825
+ b => b . TrackedBranch = trackedBranch . CanonicalName ) ;
819
826
820
827
// Got the updated branch from the Update() method
821
828
Assert . True ( branch . IsTracking ) ;
0 commit comments