From 897d9e6820794646f2e8e88204ef1775baa138f4 Mon Sep 17 00:00:00 2001
From: Andrey Lutsenko <papatramp@gmail.com>
Date: Sun, 14 Jun 2026 21:38:47 +1000
Subject: [PATCH] =?UTF-8?q?fix:=20push-remotes=20=D0=BE=D1=82=20tip=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B6=D0=B4=D0=BE=D0=B3=D0=BE=20remote?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/push-remotes.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/scripts/push-remotes.sh b/scripts/push-remotes.sh
index 6582731..88ba407 100755
--- a/scripts/push-remotes.sh
+++ b/scripts/push-remotes.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Push README.md с правильным содержимым на каждый remote (истории README расходятся).
+# Push README.md с правильным содержимым на каждый remote (ветки README расходятся).
 set -Eeuo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
@@ -11,23 +11,26 @@ push_readme() {
   local remote=$1
   local template=$2
   local message=$3
+  local branch="push-${remote}-readme"
+
+  git fetch "$remote"
+  git checkout -B "$branch" "${remote}/main"
   cp "$template" README.md
   git add README.md
   if git diff --cached --quiet; then
-    echo "[push-readme] $remote: README без изменений, push текущего HEAD"
+    echo "[push-readme] $remote: README без изменений"
   else
     git commit -m "$message"
   fi
-  if [[ $remote == github ]] && [[ -x $CHECK_SECRETS || -f $CHECK_SECRETS ]]; then
+  if [[ $remote == github ]] && [[ -f $CHECK_SECRETS ]]; then
     bash "$CHECK_SECRETS" github
   fi
-  git push "$remote" main
-  git reset --hard HEAD~1
+  git push "$remote" "${branch}:main"
+  git checkout main
+  git branch -D "$branch"
 }
 
-BASE="$(git rev-parse HEAD)"
-echo "[push-readme] база: $BASE"
-
+echo "[push-readme] kalinamall: push текущего main"
 git push kalinamall main
 
 push_readme home "$ROOT/scripts/readme/home.md" "docs: README для home (git.papatramp.ru)"
@@ -35,7 +38,9 @@ push_readme github "$ROOT/scripts/readme/github.md" "docs: README для GitHub
 
 cp "$ROOT/scripts/readme/kalinamall.md" README.md
 git add README.md
-git commit -m "docs: README для kalinamall (рабочая копия)" || true
+if ! git diff --cached --quiet; then
+  git commit -m "docs: README для kalinamall (рабочая копия)"
+fi
 git push kalinamall main
 
-echo "[push-readme] готово. GitHub/home — отдельные коммиты README; локально — kalinamall."
+echo "[push-readme] готово."