From b088bb66e5d7a05d0f4330bf1d1a2bad8ae844a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20Ma=C5=82ota?=
 <86779115+amalota@users.noreply.github.com>
Date: Mon, 10 Oct 2022 13:55:21 +0200
Subject: [PATCH] Fix release instructions, Fix homebrew update (#685)

Co-authored-by: amalota <amalota@virtuslab.com>
---
 CONTRIBUTING.md          |  2 +-
 RELEASE_NOTES.md         |  5 +++++
 ci/homebrew/ci-deploy.sh | 11 ++++++++---
 git_machete/__init__.py  |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c5a4bfdfc..0b4b44532 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -142,7 +142,7 @@ Review fixes should be pushed on separate commits for easier viewing on GitHub (
          git pull origin develop
          git checkout master
          git pull origin master
-         git merge --no-ff develop
+         git merge --ff-only develop
          git push origin master
 
 1. Verify that the release has been created on [GitHub](https://github.com/VirtusLab/git-machete/releases)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 60f565d88..2f27b3900 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 # Release notes
 
+## New in git-machete 3.12.3
+
+- fixed: release instructions in CONTRIBUTING.md are now correct
+- fixed: release to Homebrew doesn't crash the deployment process
+
 ## New in git-machete 3.12.2
 
 - added: `git-machete` is now available in homebrew core formulae; if `git-machete` has already been installed from the tap on a given machine, `brew` should automatically pull new updates from homebrew core from now on
diff --git a/ci/homebrew/ci-deploy.sh b/ci/homebrew/ci-deploy.sh
index 84afbf127..5fa5bbc21 100644
--- a/ci/homebrew/ci-deploy.sh
+++ b/ci/homebrew/ci-deploy.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e -o pipefail -u
+set -e -o pipefail -u -x
 
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" < /dev/null
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
@@ -19,13 +19,18 @@ sha256=$(
   curl -s https://$pypi_host/pypi/git-machete/"$version"/json \
   | jq --raw-output '.urls | map(select(.packagetype == "sdist")) | .[0].digests.sha256')
 
+git config user.email "gitmachete@virtuslab.com"
+git config user.name "Git Machete Bot"
+
+echo "Bump homebrew formula"
 if [[ $do_push == true ]]; then
-  brew bump-formula-pr --url "$url" --sha256 "$sha256" git-machete
+  brew bump-formula-pr --no-browse --verbose --url "$url" --sha256 "$sha256" git-machete
 else
   echo "Refraining from push since it's a dry run"
-  brew bump-formula-pr --write-only --url "$url" --sha256 "$sha256" git-machete
+  brew bump-formula-pr --write-only --no-browse --verbose --url "$url" --sha256 "$sha256" git-machete
 fi
 
+echo "Install formula locally"
 brew install --build-from-source --formula /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/git-machete.rb
 if [[ "$version" != "$(git machete --version | cut -d' ' -f4)" ]]; then
   echo "Something went wrong during brew installation: installed version does not match version from formula."
diff --git a/git_machete/__init__.py b/git_machete/__init__.py
index 303c8be69..a8ed9f418 100644
--- a/git_machete/__init__.py
+++ b/git_machete/__init__.py
@@ -1 +1 @@
-__version__ = '3.12.2'
+__version__ = '3.12.3'