From b68173332a16cd4b0f2cddc46e90721b1805a3a6 Mon Sep 17 00:00:00 2001 From: Raphael Odini Date: Wed, 31 Jan 2024 09:03:35 +0100 Subject: [PATCH] Script: on deploy, show diff between master & master_clever --- scripts/deploy_prod.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/deploy_prod.sh b/scripts/deploy_prod.sh index 68be9f890..b9fab8747 100755 --- a/scripts/deploy_prod.sh +++ b/scripts/deploy_prod.sh @@ -1,6 +1,7 @@ #!/bin/bash initial_branch=`git branch --show-current` +git_diff_between_master_and_master_clever=`git log master_clever..master --oneline` # Ensure working directory is clean if ! git diff-index --quiet HEAD; then @@ -15,6 +16,9 @@ git checkout master git pull origin master git checkout master_clever git pull origin master_clever +echo "=====" +echo "$git_diff_between_master_and_master_clever" +echo "=====" git rebase master git push origin master_clever