From ba1f1d64688882478de8534a58e6673f9b014ef4 Mon Sep 17 00:00:00 2001
From: Franjo Mindek <franjo.mindek@gmail.com>
Date: Wed, 24 Sep 2025 14:32:58 +0200
Subject: [PATCH 1/2] test

---
 opensaas-sh/.gitignore    | 4 +---
 opensaas-sh/tools/dope.sh | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opensaas-sh/.gitignore b/opensaas-sh/.gitignore
index 83beb016..908f7bbc 100644
--- a/opensaas-sh/.gitignore
+++ b/opensaas-sh/.gitignore
@@ -1,3 +1 @@
-# We can't ignore `app/` because it messes up our patch/diff procedure (check
-# the README for more info on this)
-# app/
+app/
diff --git a/opensaas-sh/tools/dope.sh b/opensaas-sh/tools/dope.sh
index 0c2f3cf4..92425c8c 100755
--- a/opensaas-sh/tools/dope.sh
+++ b/opensaas-sh/tools/dope.sh
@@ -140,6 +140,8 @@ recreate_derived_dir() {
 
   echo "DONE: generated ${DERIVED_DIR}/"
 
+  (cd "${DERIVED_DIR}" && git init -b main)
+
   if [ ${num_patches_failed} -gt 0 ]; then
     echo -e "${RED_COLOR}${num_patches_failed} patches failed, look into generated files for merge conflicts.${RESET_COLOR}"
     exit 1

From 43b784ca601f669bc192edf7db97d4cfa9d4251f Mon Sep 17 00:00:00 2001
From: Franjo Mindek <franjo.mindek@gmail.com>
Date: Wed, 24 Sep 2025 14:37:44 +0200
Subject: [PATCH 2/2] quiet

---
 opensaas-sh/tools/dope.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opensaas-sh/tools/dope.sh b/opensaas-sh/tools/dope.sh
index 92425c8c..07a35e6f 100755
--- a/opensaas-sh/tools/dope.sh
+++ b/opensaas-sh/tools/dope.sh
@@ -140,7 +140,7 @@ recreate_derived_dir() {
 
   echo "DONE: generated ${DERIVED_DIR}/"
 
-  (cd "${DERIVED_DIR}" && git init -b main)
+  (cd "${DERIVED_DIR}" && git init -b main -q)
 
   if [ ${num_patches_failed} -gt 0 ]; then
     echo -e "${RED_COLOR}${num_patches_failed} patches failed, look into generated files for merge conflicts.${RESET_COLOR}"