From 75980ada4daf74d24fd66248480f12c5dae01547 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Sat, 23 Sep 2023 08:16:25 -0400
Subject: [PATCH] Add delay before querying base ref

This is another attempt to fix the 422 fast forward errors we've been
getting.
---
 homu/main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/homu/main.py b/homu/main.py
index ab1d0c3..4722d87 100644
--- a/homu/main.py
+++ b/homu/main.py
@@ -912,6 +912,11 @@ def branch_equal_to_merge(git_cmd, state, branch):
 
 def create_merge(state, repo_cfg, branch, logger, git_cfg,
                  ensure_merge_equal=False):
+    # Add some delay to try to make sure the base repo fetch is accurate.
+    # It seems like in some cases we're getting the previous commit from GH,
+    # e.g., https://github.com/rust-lang/homu/issues/75#issuecomment-1729058969
+    # Hopefully a delay helps.
+    time.sleep(60)
     base_sha = state.get_repo().ref('heads/' + state.base_ref).object.sha
 
     state.refresh()