libgit2 / libgit2/libgit2sharp

Issue adding tracking branch with sparse checkout in Jenkins

未關閉
#1,722 0 則留言 0 個 reaction 已指派 0 人 在 GitHub 檢視

還沒有人認領這個 Issue。

主要語言
C#
星號
3.5k
分支
925
PR 合併指標
30 天內沒有已合併 PR

描述

I've replicated an issue we have when running Gitversion (that uses this library) inside a Jenkins checkout step. Jenkins is running with space checkout.
I've created a test repository with the code in question, that I've replicated from the test case https://github.com/libgit2/libgit2sharp/blob/v0.26.1/LibGit2Sharp.Tests/BranchFixture.cs#L719L749
The code in question to create a local branch and set it to track it's remote is this:

            using (var repo = new Repository("."))
            {

                var remoteRefName = "refs/remotes/origin/master";
                var branchName = "master";

                var remoteBranch = repo.Branches[remoteRefName];

                var localBranch = repo.Branches[branchName];
                if (localBranch == null)
                {
                    localBranch = repo.CreateBranch(branchName, remoteBranch.Tip);
                }

                repo.Branches.Update(localBranch, b =>
                {
                    b.TrackedBranch = remoteBranch.CanonicalName;
                });
            }

taken from https://github.com/joaomatossilva/libgitsharp-issue/blob/master/TestApp/Program.cs

The reproduction commands were taken out of a log from Jenkins build

Reproduction steps

Execute the following steps on a clean directory:

git init
git config remote.origin.url https://github.com/joaomatossilva/libgitsharp-issue.git
git config --add remote.origin.fetch +refs/pull/1/head:refs/remotes/origin/pr-1
git config --add remote.origin.fetch +refs/heads/master:refs/remotes/origin/master
git config remote.origin.url https://github.com/joaomatossilva/libgitsharp-issue.git
git fetch --force --progress -- https://github.com/joaomatossilva/libgitsharp-issue.git +refs/pull/1/head:refs/remotes/origin/pr-1 +refs/heads/master:refs/remotes/origin/master
git config core.sparsecheckout
git checkout -f 1bacdbeeda22863bbb8ba8f89dc933246bd4944c
dotnet run --project ./TestApp/TestApp.csproj

Expected behavior

It would be expected to have the same behaviour as
git branch --set-upstream-to=origin/master master

Actual behavior
Unhandled Exception: LibGit2Sharp.LibGit2SharpException: ref 'refs/remotes/origin/master' doesn't match the destination
   at LibGit2Sharp.Core.Ensure.HandleError(Int32 result) in C:\projects\libgit2sharp\LibGit2Sharp\Core\Ensure.cs:line 136
   at LibGit2Sharp.Core.Proxy.git_refspec_rtransform(IntPtr refSpecPtr, String name) in C:\projects\libgit2sharp\LibGit2Sharp\Core\Proxy.cs:line 2076
   at LibGit2Sharp.Remote.FetchSpecTransformToSource(String reference) in C:\projects\libgit2sharp\LibGit2Sharp\Remote.cs:line 135
   at LibGit2Sharp.BranchUpdater.GetUpstreamInformation(String canonicalName, String& remoteName, String& mergeBranchName) in C:\projects\libgit2sharp\LibGit2Sharp\BranchUpdater.cs:line 188
   at LibGit2Sharp.BranchUpdater.SetUpstream(String upstreamBranchName) in C:\projects\libgit2sharp\LibGit2Sharp\BranchUpdater.cs:line 118
   at TestApp.Program.<>c__DisplayClass0_0.<Main>b__0(BranchUpdater b) in C:\temp\git-issue\TestApp\Program.cs:line 25
   at LibGit2Sharp.BranchCollection.Update(Branch branch, Action`1[] actions) in C:\projects\libgit2sharp\LibGit2Sharp\BranchCollection.cs:line 292
   at TestApp.Program.Main(String[] args) in C:\temp\git-issue\TestApp\Program.cs:line 23
Version of LibGit2Sharp (release number or SHA1)

0.26.1

Operating system(s) tested; .NET runtime tested

Windows 10, .Net core 2.2

貢獻指南

開啟貢獻指南

從這裡開始

  1. 先讀完整個 Issue,再讀專案的貢獻指南。
  2. 在 Issue 下留言說明你要接手 —— 這能避免兩個人做同樣的事。
  3. Fork 儲存庫,在一個分支上完成修改。
  4. 送出 Pull Request,並在描述裡引用這個 Issue 編號。

研究方向

先從 LibGit2Sharp.Tests/BranchFixture.cs 中的重現命令和相關測試開始,然後沿著 stack trace 檢查 BranchUpdater.cs 和 Remote.cs。將 sparse-checkout 的行為與預期的 git branch --set-upstream-to 命令進行比較,並新增或更新一個回歸測試,以證明 tracking refs 得到了正確處理。

由索引模型根據 Issue 內容生成。

評估

技術堆疊
csharp, git
領域
devtools
Issue 類型
缺陷
難度
3/5
預估耗時
1-2 天
活躍度
停滯
描述清晰度
描述清楚
新手友好度
45/100

把新 issue 寄到你的電子郵件信箱

精選適合新手參與的 GitHub issue 摘要。