From e9a32b4c9f42c5d43c3f12116403a050fe5c6943 Mon Sep 17 00:00:00 2001
From: Daniel Rozenberg <rodaniel@amp.dev>
Date: Fri, 23 Jul 2021 16:18:50 -0400
Subject: [PATCH] Fetch the merge commit in the Initialize Git job to add it to
 the cache

---
 .circleci/config.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4e2a631c4d4..f9fa96f844ef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -127,13 +127,15 @@ jobs:
             - source-v1-{{ .Branch }}-
             - source-v1-
       - checkout
+      - run:
+          name: 'Compute and Fetch Merge Commit'
+          command: |
+            ./.circleci/compute_merge_commit.sh
+            ./.circleci/fetch_merge_commit.sh
       - save_cache:
           key: source-v1-{{ .Branch }}-{{ .Revision }}
           paths:
             - .git
-      - run:
-          name: 'Initialize Git'
-          command: ./.circleci/compute_merge_commit.sh
       - run:
           name: 'Store maybe_gracefully_halt.sh in Workspace'
           command: cp .circleci/maybe_gracefully_halt.sh /tmp/workspace