From d22fc6ebb19ff59c36ea5f49b53f842427e9626a Mon Sep 17 00:00:00 2001
From: Ed Hennis <ed@ripple.com>
Date: Fri, 30 Jun 2023 16:47:18 -0400
Subject: [PATCH] fixup! ci: cancel overridden workflows (#4597)

---
 .github/workflows/nix.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 73871e19317..2061b34a8d7 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -156,6 +156,7 @@ jobs:
           # fail. However, Github will probably prevent the job from
           # running at all.
           git log --oneline
+          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
           git merge --no-commit --no-edit -v \
             ${{ github.event.pull_request.base.sha }}
           git diff || true