diff --git a/ci-tools/update-production b/ci-tools/update-production index 52079d5eb0a4e975bcad265ba7d1d9c6b9a391da..7892bce0922075188e92110d1b289528b2b51b22 100755 --- a/ci-tools/update-production +++ b/ci-tools/update-production @@ -78,17 +78,22 @@ describe_update() { local TARGET_BRANCH=$1 shift - local NOTES=$(git diff origin/"$TARGET_BRANCH"...origin/"$SOURCE_BRANCH" -- DEPLOYMENT-NOTES.rst) + # Since production production (target) should not diverge from develop + # (source) it is fine to use `..` instead of `...` in the git ranges here. + # `...` encounters problems related to discovering the merge base because + # of the way GitLab manages the git checkout on CI (I think). + + local NOTES=$(git diff origin/"$TARGET_BRANCH"..origin/"$SOURCE_BRANCH" -- DEPLOYMENT-NOTES.rst) # There often are no notes and that makes for boring reading so toss in a # diffstat as well. - local DIFFSTAT=$(git diff --stat origin/"$TARGET_BRANCH"...origin/"$SOURCE_BRANCH") + local DIFFSTAT=$(git diff --stat origin/"$TARGET_BRANCH"..origin/"$SOURCE_BRANCH") local WHEN=$(git log --max-count=1 --format='%cI' origin/"$TARGET_BRANCH") # Describe all of the MRs that were merged into the source branch that are # about to be merged into the target branch. - local MR=$(describe_merge_requests origin/"$TARGET_BRANCH"...origin/"$SOURCE_BRANCH" "$SOURCE_BRANCH") + local MR=$(describe_merge_requests origin/"$TARGET_BRANCH"..origin/"$SOURCE_BRANCH" "$SOURCE_BRANCH") echo "\ Changes from $SOURCE_BRANCH since $WHEN