Stone/GitSync

只同步一个分支
大石头 authored at 2025-10-19 08:54:48
df8e256
Tree
1 Parent(s) 4f96ab2
Summary: 3 changed files with 13 additions and 11 deletions.
Modified +2 -2
Modified +9 -7
Modified +2 -2
Modified +2 -2
diff --git a/GitSync/GitSync.csproj b/GitSync/GitSync.csproj
index e2e67eb..055df7c 100644
--- a/GitSync/GitSync.csproj
+++ b/GitSync/GitSync.csproj
@@ -30,8 +30,8 @@
     <Using Include="NewLife.Reflection" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.6.2025.901" />
-    <PackageReference Include="NewLife.Stardust" Version="3.4.2025.901" />
+    <PackageReference Include="NewLife.Core" Version="11.7.2025.1001" />
+    <PackageReference Include="NewLife.Stardust" Version="3.4.2025.1001" />
   </ItemGroup>
 
 </Project>
Modified +9 -7
diff --git a/GitSync/Services/GitService.cs b/GitSync/Services/GitService.cs
index 72d03b4..9d149e1 100644
--- a/GitSync/Services/GitService.cs
+++ b/GitSync/Services/GitService.cs
@@ -118,13 +118,15 @@ internal class GitService(IServiceProvider serviceProvider, ITracer tracer)
         {
             // 记住当前分支,最后要切回来
             var currentBranch = gr.CurrentBranch ?? branchs[0];
-            // 当前分支必须在第一位,避免有些修改被切到其它分支上
-            if (!currentBranch.IsNullOrEmpty() && branchs.Length > 0 && currentBranch != branchs[0])
-            {
-                var bs = branchs.ToList();
-                bs.Remove(currentBranch);
-                bs.Insert(0, currentBranch);
-            }
+            //// 当前分支必须在第一位,避免有些修改被切到其它分支上
+            //if (!currentBranch.IsNullOrEmpty() && branchs.Length > 0 && currentBranch != branchs[0])
+            //{
+            //    var bs = branchs.ToList();
+            //    bs.Remove(currentBranch);
+            //    bs.Insert(0, currentBranch);
+            //}
+            // 只同步一个分支
+            branchs = [currentBranch];
             foreach (var item in branchs)
             {
                 using var span2 = tracer?.NewSpan($"ProcessBranch-{item}", repo);
Modified +2 -2
diff --git a/TestProject1/TestProject1.csproj b/TestProject1/TestProject1.csproj
index d0ae66f..a88ebd2 100644
--- a/TestProject1/TestProject1.csproj
+++ b/TestProject1/TestProject1.csproj
@@ -22,9 +22,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>