From 4ac309e73216a4b81caf31a57db0d60960856548 Mon Sep 17 00:00:00 2001
From: xudan <staysky25@outlook.com>
Date: Mon, 16 Jun 2025 18:09:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DPowerShell=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E7=9A=84=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E4=B8=AD=E6=96=87=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 自动同步仓库.ps1 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/自动同步仓库.ps1 b/自动同步仓库.ps1
index 4946215..03d8613 100644
--- a/自动同步仓库.ps1
+++ b/自动同步仓库.ps1
@@ -6,6 +6,13 @@ param(
     [switch]$DryRun = $false
 )
 
+# 设置控制台编码以正确显示中文
+[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+$OutputEncoding = [System.Text.Encoding]::UTF8
+
+# 设置Git配置以正确处理中文
+$env:LC_ALL = "zh_CN.UTF-8"
+
 function Write-ColorOutput {
     param(
         [string]$Message,
@@ -47,10 +54,10 @@ function Sync-Repositories {
     }
     
     # 检查是否有新的提交
-    $upstreamCommits = git log HEAD..upstream/master --oneline
+    $upstreamCommits = & git log HEAD..upstream/master --oneline | ForEach-Object { [System.Text.Encoding]::UTF8.GetString([System.Text.Encoding]::Default.GetBytes($_)) }
     if ($upstreamCommits) {
         Write-ColorOutput "发现镜像仓库有新的提交:" "Yellow"
-        Write-ColorOutput $upstreamCommits "Gray"
+        $upstreamCommits | ForEach-Object { Write-ColorOutput $_ "Gray" }
         
         if ($UseRebase) {
             Write-ColorOutput "正在使用rebase合并代码..." "Green"
@@ -90,10 +97,10 @@ function Sync-Repositories {
         Write-ColorOutput "镜像仓库没有新的提交，检查本地是否有未推送的修改..." "Blue"
         
         # 检查是否有本地修改需要推送
-        $localCommits = git log origin/master..HEAD --oneline
+        $localCommits = & git log origin/master..HEAD --oneline | ForEach-Object { [System.Text.Encoding]::UTF8.GetString([System.Text.Encoding]::Default.GetBytes($_)) }
         if ($localCommits) {
             Write-ColorOutput "发现本地有未推送的修改:" "Yellow"
-            Write-ColorOutput $localCommits "Gray"
+            $localCommits | ForEach-Object { Write-ColorOutput $_ "Gray" }
             
             Write-ColorOutput ""
             Write-ColorOutput "下一步操作提示:" "Cyan"