Skip to content

Commit ee5393f

Browse files
committed
Clarify branch tracking related tests
Related to #903
1 parent d8189b1 commit ee5393f

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

LibGit2Sharp.Tests/BranchFixture.cs

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,12 @@ public void CanSetTrackedBranch()
683683
string path = SandboxStandardTestRepo();
684684
using (var repo = new Repository(path))
685685
{
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);
687690
Assert.False(branch.IsTracking);
688691

689-
Branch trackedBranch = repo.Branches[trackedBranchName];
690692
repo.Branches.Update(branch,
691693
b => b.TrackedBranch = trackedBranch.CanonicalName);
692694

@@ -743,10 +745,12 @@ public void CanSetUpstreamBranch()
743745
string path = SandboxStandardTestRepo();
744746
using (var repo = new Repository(path))
745747
{
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);
747752
Assert.False(branch.IsTracking);
748753

749-
Branch trackedBranch = repo.Branches[trackedBranchName];
750754
Branch updatedBranch = repo.Branches.Update(branch,
751755
b => b.Remote = remoteName,
752756
b => b.UpstreamBranch = upstreamBranchName);
@@ -773,10 +777,11 @@ public void CanSetLocalTrackedBranch()
773777
string path = SandboxStandardTestRepo();
774778
using (var repo = new Repository(path))
775779
{
776-
Branch branch = repo.CreateBranch(testBranchName);
777-
Assert.False(branch.IsTracking);
778-
779780
Branch trackedBranch = repo.Branches[localTrackedBranchName];
781+
Assert.False(trackedBranch.IsRemote);
782+
783+
Branch branch = repo.CreateBranch(testBranchName, trackedBranch.Tip);
784+
Assert.False(branch.IsTracking);
780785

781786
repo.Branches.Update(branch,
782787
b => b.TrackedBranch = trackedBranch.CanonicalName);
@@ -811,11 +816,13 @@ public void CanUnsetTrackedBranch()
811816
string path = SandboxStandardTestRepo();
812817
using (var repo = new Repository(path))
813818
{
814-
Branch branch = repo.CreateBranch(testBranchName);
819+
Branch trackedBranch = repo.Branches[trackedBranchName];
820+
821+
Branch branch = repo.CreateBranch(testBranchName, trackedBranch.Tip);
815822
Assert.False(branch.IsTracking);
816823

817824
branch = repo.Branches.Update(branch,
818-
b => b.TrackedBranch = trackedBranchName);
825+
b => b.TrackedBranch = trackedBranch.CanonicalName);
819826

820827
// Got the updated branch from the Update() method
821828
Assert.True(branch.IsTracking);

0 commit comments

Comments
 (0)