From 74685e359c4792f9f10886b7557432a112097feb Mon Sep 17 00:00:00 2001
From: Anagh Hegde <anagh.hv@gmail.com>
Date: Tue, 27 Aug 2024 13:11:50 +0530
Subject: [PATCH] ci: update logic for handling the merge commits (#35898)

## Description
> [!TIP]
> _Add a TL;DR when the description is longer than 500 words or
extremely technical (helps the content, marketing, and DevRel team)._
>
> _Please also include relevant motivation and context. List any
dependencies that are required for this change. Add links to Notion,
Figma or any other documents that might be relevant to the PR._


Fixes #`Issue Number`
_or_
Fixes `Issue URL`
> [!WARNING]
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags=""

### :mag: Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!CAUTION]
> If you modify the content in this section, you are likely to disrupt
the CI result for your PR.

<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No
---
 .github/workflows/sync-release-to-pg.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/sync-release-to-pg.yml b/.github/workflows/sync-release-to-pg.yml
index 13f474b095..981f124261 100644
--- a/.github/workflows/sync-release-to-pg.yml
+++ b/.github/workflows/sync-release-to-pg.yml
@@ -24,8 +24,16 @@ jobs:
       - name: Get new commits from release
         id: get_commits
         run: |
-          COMMITS=$(git log pg..release --oneline | awk '{print $1}')
-          echo "COMMITS=\"$COMMITS\"" >> $GITHUB_ENV
+          # Compare the heads of pg and release
+          PG_HEAD=$(git rev-parse pg)
+          RELEASE_HEAD=$(git rev-parse release)
+
+          echo "PG_HEAD=$PG_HEAD" >> $GITHUB_ENV
+          echo "RELEASE_HEAD=$RELEASE_HEAD" >> $GITHUB_ENV
+
+          # Get new commits on release that are not yet in pg
+          COMMITS=$(git log --reverse --pretty=format:"%H" $PG_HEAD..$RELEASE_HEAD)
+          echo "COMMITS=$COMMITS" >> $GITHUB_ENV
 
       - name: Merge commits one by one
         id: merge_commits
@@ -38,12 +46,12 @@ jobs:
 
           # Loop through each commit
           for commit in "${commit_array[@]}"; do
-            echo "Merging commit $commit"
-            git cherry-pick $commit || {
+            echo "Attempting to cherry-pick commit $commit"
+            if ! git cherry-pick $commit; then
               echo "Conflict detected with commit $commit"
               conflicted_commits+=($commit)
               git cherry-pick --abort
-            }
+            fi
           done
 
           # Save conflicted commits to environment variable