From bd04f5b9cbb2980d2c12671b0727de41bf10ec36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D0=B8=D0=B9=20=D0=A2=D0=BE?= =?UTF-8?q?=D0=BB=D1=81=D1=82=D0=BE=D0=B2?= Date: Thu, 1 May 2025 21:58:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.github/workflows/job=5Fsync.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/job_sync.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index ad2db1e..e990085 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -23,9 +23,9 @@ jobs: git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY} - git merge upstream/master - git push upstream master --progress - git push origin master --progress + git merge --no-edit --ff-only -v upstream/master + git push upstream master -v --progress + git push origin master -v --progress cd ../ rm -rf repo @@ -34,9 +34,9 @@ jobs: git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY} - git merge upstream/v3 - git push upstream v3 --progress - git push origin v3 --progress + git merge --no-edit --ff-only -v upstream/v3 + git push upstream v3 -v --progress + git push origin v3 -v --progress cd ../ rm -rf repo @@ -45,8 +45,8 @@ jobs: git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY} - git merge upstream/v4 - git push upstream v4 --progress - git push origin v4 --progress + git merge --no-edit --ff-only -v upstream/v4 + git push upstream v4 -v --progress + git push origin v4 -v --progress cd ../ rm -rf repo