From 5f03ba31d7c4b1b01e85535c27c815f55cfd02b4 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 16 Nov 2021 15:11:06 -0600
Subject: [PATCH] Fix validating clean config on CircleCI

---
 targets/drupal.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index 98ee5d47..b49d27da 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -31,8 +31,11 @@
       <!-- Assembling this property at run time. -->
       <property name="drupal.validate_clean_config.dir" value="${build.dir}/${drupal.root}/${drupal.site.config_sync_directory}" />
 
-        <!-- Use git to list local (not yet committed) changes to the config directory. -->
-        <exec command="git status --porcelain ${drupal.validate_clean_config.dir}" outputProperty="modified_files" />
+        <!-- Use git to list local (not yet committed) changes to the config
+             directory. Suppress errors so that this command will run even if
+             the project isn't a git directory (e.g. on the-build's CircleCI
+             test!) -->
+        <exec command="git status --porcelain ${drupal.validate_clean_config.dir} 2>/dev/null" outputProperty="modified_files" />
 
         <if>
             <and>