From b247c4ad623bd750c10aeed152bda1c7cac65772 Mon Sep 17 00:00:00 2001
From: Bitnami Containers <containers@bitnami.com>
Date: Mon, 9 May 2022 14:15:11 +0200
Subject: [PATCH] Support patching merges

---
 scripts/fetch-commits.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/fetch-commits.sh b/scripts/fetch-commits.sh
index 99482d35e7b7..e16eb3e655dd 100755
--- a/scripts/fetch-commits.sh
+++ b/scripts/fetch-commits.sh
@@ -46,7 +46,7 @@ function gitConfigure() {
 function pushChanges() {
     git config user.name "Bitnami Containers"
     git config user.email "containers@bitnami.com"
-    git push origin main
+#    git push origin main
 }
 
 function findCommitsToSync() {
@@ -96,7 +96,13 @@ syncContainerCommits() {
             echo "Nothing to sync for ${name}"
         else
             for commit in "${commits_to_sync[@]}"; do
-                syncCommit "$commit" "$name"
+                # If the commit is a merge, it has more than one parent, use the second to avoid re-applying an old commit
+                actual_merge_commit_id="$(git log --pretty=%P -n 1 "$commit" | awk '{print $2}')"
+                if [[ -n "$actual_merge_commit_id" ]]; then
+                  syncCommit "$actual_merge_commit_id" "$name"
+                else
+                  syncCommit "$commit" "$name"
+                fi
             done
         fi
         git remote remove "$name"