From 9068085dd2643c1c3c7afb356bd2f8dd884f0941 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 2 Dec 2019 13:22:51 +0000
Subject: [PATCH] generate_formulae.brew.sh_data: fetch/rebase when needed.

Similar change to https://github.com/Homebrew/brew/pull/6791.
---
 .github/workflows/generate_formulae.brew.sh_data.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/generate_formulae.brew.sh_data.yml b/.github/workflows/generate_formulae.brew.sh_data.yml
index 663c4a5bd2..e6f547b4f3 100644
--- a/.github/workflows/generate_formulae.brew.sh_data.yml
+++ b/.github/workflows/generate_formulae.brew.sh_data.yml
@@ -37,6 +37,8 @@ jobs:
 
           if ! git diff --exit-code HEAD -- _data/analytics _data/formula api/formula formula cask; then
             git commit -m "formula: update from ${GITHUB_REPOSITORY} push" _data/analytics _data/formula api/formula formula
+            git fetch
+            git rebase origin/master
             git push
           fi
         env: