Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-02-10 03:15:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with nested merge commits

Browse Source 
Signed-off-by: Fran Mulero <fmulero@vmware.com>
This commit is contained in:
Fran Mulero
2022-06-28 19:28:50 +02:00
parent 9f27a23a67
commit d7838446c4
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/fetch-commits.sh
View File

@@ -64,8 +64,9 @@ function findCommitsToSync() {
local max=100 # If we need to sync more than 100 commits there must be something wrong since we run the job on a daily basis
for commit in "${commits[@]}"; do
if [[ "$commit" != "$last_synced_commit_id" ]] && [[ "$max" -gt "0" ]]; then
if [[ "$commit" != "$SKIP_COMMIT_ID" ]]; then
commits_to_sync="${commit} ${commits_to_sync}"
actual_commit_id="$(plainCommit "${commit}")"
if [[ "$commit" != "$SKIP_COMMIT_ID" ]] && [[ ! $commits_to_sync =~ (^|[[:space:]])$actual_commit_id($|[[:space:]]) ]]; then
commits_to_sync="${actual_commit_id} ${commits_to_sync}"
fi
else
# We reached the last commit synced
@@ -78,6 +79,16 @@ function findCommitsToSync() {
printf "$commits_to_sync"
}
function plainCommit() {
local commit="${1:?Missing commit}"
local result="$commit"
actual_merge_commit_id="$(git log --pretty=%P -n 1 "$commit" | awk '{print $2}')"
if [[ -n "$actual_merge_commit_id" ]]; then
result="$(plainCommit $actual_merge_commit_id)"
fi
printf "$result"
}
syncCommit() {
local -r commit_id="${1:?Missing commit id}"
local -r app="${2:?Missing app name}"
@@ -99,13 +110,7 @@ syncContainerCommits() {
echo "Nothing to sync for ${name}"
else
for commit in "${commits_to_sync[@]}"; do
# 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
syncCommit "$commit" "$name"
done
fi
git remote remove "$name"