diff --git a/LibGit2Sharp.Tests/BranchFixture.cs b/LibGit2Sharp.Tests/BranchFixture.cs index 736b0faec..029f58871 100644 --- a/LibGit2Sharp.Tests/BranchFixture.cs +++ b/LibGit2Sharp.Tests/BranchFixture.cs @@ -879,6 +879,39 @@ public void CanUnsetTrackedBranch() } } + [Fact] + public void CanSetTrackedBranch_MultipleFetchSpecs() + { + const string testBranchName = "master"; + const string trackedBranchName = "refs/remotes/origin/master"; + + string path = SandboxMultiFetchSpecTestRepo(); + using (var repo = new Repository(path)) + { + Branch trackedBranch = repo.Branches[trackedBranchName]; + Assert.True(trackedBranch.IsRemote); + + Branch branch = repo.CreateBranch(testBranchName, trackedBranch.Tip); + Assert.False(branch.IsTracking); + + repo.Branches.Update(branch, + b => b.TrackedBranch = trackedBranch.CanonicalName); + + // Verify the immutability of the branch. + Assert.False(branch.IsTracking); + + // Get the updated branch information. + branch = repo.Branches[testBranchName]; + + Remote upstreamRemote = repo.Network.Remotes["origin"]; + Assert.NotNull(upstreamRemote); + + Assert.True(branch.IsTracking); + Assert.Equal(trackedBranch, branch.TrackedBranch); + Assert.Equal("origin", branch.RemoteName); + } + } + [Fact] public void CanWalkCommitsFromBranch() { diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/AnotherFile.txt b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/AnotherFile.txt new file mode 100644 index 000000000..4f4c1659d --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/AnotherFile.txt @@ -0,0 +1 @@ +This is another file diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/FETCH_HEAD b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/HEAD b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/HEAD new file mode 100644 index 000000000..1c7859fee --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/PR-28 diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/config b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/config new file mode 100644 index 000000000..6c69d1171 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + ignorecase = true +[remote "origin"] + url = ../multifetchspec_testrepo.git/ + fetch = +refs/pull/28/head:refs/remotes/origin/PR-28 + fetch = +refs/heads/master:refs/remotes/origin/master + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "PR-28"] + remote = origin + merge = refs/pull/28/head diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/index b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/index new file mode 100644 index 000000000..57e64a1e1 Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/index differ diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/03/0c7945c1e7eab74072acedfcd2a16db351a9a5 b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/03/0c7945c1e7eab74072acedfcd2a16db351a9a5 new file mode 100644 index 000000000..7e58b7e10 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/03/0c7945c1e7eab74072acedfcd2a16db351a9a5 @@ -0,0 +1 @@ +x+)JMU°0f040031QpÌË/ÉH-rËÌIÕ+©(a(¿XšyäûÞŸüÛkÖŸ8iSüà6Ti^jy|LÝ+Wþ©³'Çìçßxg‚fãºÆÉm;|I %ý \ No newline at end of file diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/65/1df87831579c12dab081797720d9973edf477a b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/65/1df87831579c12dab081797720d9973edf477a new file mode 100644 index 000000000..10f3dcfe5 Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/65/1df87831579c12dab081797720d9973edf477a differ diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/77/d8517569c4f7bdf90fb77cafc8c93c7353e0db b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/77/d8517569c4f7bdf90fb77cafc8c93c7353e0db new file mode 100644 index 000000000..909ab0f0c Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/77/d8517569c4f7bdf90fb77cafc8c93c7353e0db differ diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/b9/767f840d2eda4faeafe47712eb3bdf506f8a0a b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/b9/767f840d2eda4faeafe47712eb3bdf506f8a0a new file mode 100644 index 000000000..e639ea8d5 Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/b9/767f840d2eda4faeafe47712eb3bdf506f8a0a differ diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/c6/242f94be8cb6ad9448a4bb7f57aa4233431e02 b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/c6/242f94be8cb6ad9448a4bb7f57aa4233431e02 new file mode 100644 index 000000000..a2f363a21 Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/c6/242f94be8cb6ad9448a4bb7f57aa4233431e02 differ diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/ea/450f959b935cbf0fb1dc902981ae819386b84d b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/ea/450f959b935cbf0fb1dc902981ae819386b84d new file mode 100644 index 000000000..0128db926 Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/objects/ea/450f959b935cbf0fb1dc902981ae819386b84d differ diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/heads/PR-28 b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/heads/PR-28 new file mode 100644 index 000000000..ee2a3ea34 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/heads/PR-28 @@ -0,0 +1 @@ +b9767f840d2eda4faeafe47712eb3bdf506f8a0a diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/remotes/origin/PR-28 b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/remotes/origin/PR-28 new file mode 100644 index 000000000..ee2a3ea34 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/remotes/origin/PR-28 @@ -0,0 +1 @@ +b9767f840d2eda4faeafe47712eb3bdf506f8a0a diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/remotes/origin/master b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/remotes/origin/master new file mode 100644 index 000000000..3cb9a239b --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/dot_git/refs/remotes/origin/master @@ -0,0 +1 @@ +651df87831579c12dab081797720d9973edf477a diff --git a/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/new_file.txt b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/new_file.txt new file mode 100644 index 000000000..3a5a4769c --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/multifetchspec_testrepo_wd/new_file.txt @@ -0,0 +1 @@ +New file diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs index 51496c2f5..072498bb9 100644 --- a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs +++ b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs @@ -33,6 +33,7 @@ static BaseFixture() public static string BareTestRepoPath { get; private set; } public static string StandardTestRepoWorkingDirPath { get; private set; } + public static string StandardMultiFetchSpecWorkingDirPath { get; private set; } public static string StandardTestRepoPath { get; private set; } public static string ShallowTestRepoPath { get; private set; } public static string MergedTestRepoWorkingDirPath { get; private set; } @@ -74,6 +75,7 @@ private static void SetUpTestEnvironment() BareTestRepoPath = Path.Combine(ResourcesDirectory.FullName, "testrepo.git"); StandardTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "testrepo_wd"); StandardTestRepoPath = Path.Combine(StandardTestRepoWorkingDirPath, "dot_git"); + StandardMultiFetchSpecWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "multifetchspec_testrepo_wd"); ShallowTestRepoPath = Path.Combine(ResourcesDirectory.FullName, "shallow.git"); MergedTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "mergedrepo_wd"); MergeRenamesTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "mergerenames_wd"); @@ -183,6 +185,11 @@ protected string SandboxStandardTestRepo() return Sandbox(StandardTestRepoWorkingDirPath); } + protected string SandboxMultiFetchSpecTestRepo() + { + return Sandbox(StandardMultiFetchSpecWorkingDirPath); + } + protected string SandboxMergedTestRepo() { return Sandbox(MergedTestRepoWorkingDirPath); diff --git a/LibGit2Sharp/Remote.cs b/LibGit2Sharp/Remote.cs index 3bf957866..b0b195032 100644 --- a/LibGit2Sharp/Remote.cs +++ b/LibGit2Sharp/Remote.cs @@ -134,8 +134,16 @@ internal unsafe string FetchSpecTransformToSource(string reference) { using (RemoteHandle remoteHandle = Proxy.git_remote_lookup(repository.Handle, Name, true)) { - git_refspec* fetchSpecPtr = Proxy.git_remote_get_refspec(remoteHandle, 0); - return Proxy.git_refspec_rtransform(new IntPtr(fetchSpecPtr), reference); + var fetchSpec = IntPtr.Zero; + var refspecCount = Proxy.git_remote_refspec_count(remoteHandle); + for (int i = 0; i < refspecCount; i++) + { + fetchSpec = new IntPtr(Proxy.git_remote_get_refspec(remoteHandle, i)); + if (Proxy.git_refspec_dst_matches(fetchSpec, reference)) + break; + } + + return Proxy.git_refspec_rtransform(fetchSpec, reference); } }