🩹 [Patch]: Update fetch-depth to 0 in Update-FontsData workflow and enhance git operations in script

Author: MariusStorhaug

.github/workflows/Update-FontsData.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 1
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Update-FontsData

scripts/Update-FontsData.ps1

@@ -31,11 +31,36 @@
     }
 }
 
-Invoke-NativeCommand git checkout main
-Invoke-NativeCommand git pull
+# Get the current branch and default branch information
+$currentBranch = (Invoke-NativeCommand git rev-parse --abbrev-ref HEAD).Trim()
+$defaultBranch = (Invoke-NativeCommand git remote show origin | Select-String 'HEAD branch:' | ForEach-Object { $_.ToString().Split(':')[1].Trim() })
+
+Write-Output "Current branch: $currentBranch"
+Write-Output "Default branch: $defaultBranch"
+
+# Fetch latest changes from remote
+Invoke-NativeCommand git fetch origin
+
+# Get the head branch (latest default branch)
+Invoke-NativeCommand git checkout $defaultBranch
+Invoke-NativeCommand git pull origin $defaultBranch
+
 $timeStamp = Get-Date -Format 'yyyyMMdd-HHmmss'
-$branchName = "auto-font-update-$timeStamp"
-Invoke-NativeCommand git checkout -b $branchName
+
+# Determine target branch based on current context
+if ($currentBranch -eq $defaultBranch) {
+    # Running on main/default branch - create new branch
+    $targetBranch = "auto-font-update-$timeStamp"
+    Write-Output "Running on default branch. Creating new branch: $targetBranch"
+    Invoke-NativeCommand git checkout -b $targetBranch
+} else {
+    # Running on another branch (e.g., workflow_dispatch) - use current branch
+    $targetBranch = $currentBranch
+    Write-Output "Running on feature branch. Using existing branch: $targetBranch"
+    Invoke-NativeCommand git checkout $targetBranch
+    # Merge latest changes from default branch
+    Invoke-NativeCommand git merge origin/$defaultBranch
+}
 
 $release = Get-GitHubRelease -Owner ryanoasis -Repository nerd-fonts
 $fonts = @()
@@ -61,15 +86,24 @@ $changes = Invoke-NativeCommand git status --porcelain
 if (-not [string]::IsNullOrWhiteSpace($changes)) {
     Invoke-NativeCommand git add .
     Invoke-NativeCommand git commit -m "Update-FontsData via script on $timeStamp"
-    Invoke-NativeCommand git push --set-upstream origin $branchName
 
-    Invoke-NativeCommand gh pr create `
-        --base main `
-        --head $branchName `
-        --title "Auto-Update: NerdFonts Data ($timeStamp)" `
-        --body 'This PR updates FontsData.json with the latest NerdFonts metadata.'
+    # Push behavior depends on branch type
+    if ($targetBranch -eq $currentBranch -and $currentBranch -ne $defaultBranch) {
+        # Push to existing branch
+        Invoke-NativeCommand git push origin $targetBranch
+        Write-Output "Changes committed and pushed to existing branch: $targetBranch"
+    } else {
+        # Push new branch and create PR
+        Invoke-NativeCommand git push --set-upstream origin $targetBranch
 
-    Write-Output 'Changes detected and PR opened.'
+        Invoke-NativeCommand gh pr create `
+            --base $defaultBranch `
+            --head $targetBranch `
+            --title "Auto-Update: NerdFonts Data ($timeStamp)" `
+            --body 'This PR updates FontsData.json with the latest NerdFonts metadata.'
+
+        Write-Output "Changes detected and PR opened for branch: $targetBranch"
+    }
 } else {
     Write-Output 'No changes to commit.'
 }