SSL Cert Fixes

push-to-gitea.ps1

@@ -41,6 +41,30 @@ if ((git remote) -match '^origin$') {
     git remote add origin $Remote
 }
 
+# ------------------------------------------------- finish what was started
+
+# A rebase or merge left half-done blocks everything that follows, and the error
+# git gives is easy to mistake for a push problem. Catch it here and say plainly
+# what to do.
+$gitDir = (git rev-parse --git-dir 2>$null)
+if ($gitDir) {
+    $stuck = @('rebase-merge', 'rebase-apply', 'MERGE_HEAD', 'CHERRY_PICK_HEAD') |
+        Where-Object { Test-Path (Join-Path $gitDir $_) }
+    if ($stuck) {
+        Write-Host ''
+        Write-Host 'There is an unfinished rebase or merge in this folder.' -ForegroundColor Red
+        Write-Host 'Nothing else can happen until it is settled. Your options:' -ForegroundColor Yellow
+        Write-Host ''
+        Write-Host '  git rebase --abort     throw the attempt away and go back to how things were'
+        Write-Host '  git status             see which files still need attention'
+        Write-Host '  git rebase --continue   after fixing the files git listed'
+        Write-Host ''
+        Write-Host 'If you are unsure, "git rebase --abort" is the safe one. It puts the' -ForegroundColor Yellow
+        Write-Host 'folder back exactly as it was before the rebase started.' -ForegroundColor Yellow
+        exit 1
+    }
+}
+
 # ---------------------------------------------------------------- commit
 
 git add -A