git add --force files (#26)

* git add --force files * Print errors to stderr instead of a file
nubank · Nov 21, 2024 · 9a44834 · 9a44834
1 parent 9180026
commit 9a44834
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/run.sh b/run.sh
@@ -8,4 +8,4 @@ default_branch=$3
 service_directory=$4
 migrations_directory=$5
 
-clojure -m ordnungsamt.core "$org" "$service" "$default_branch" "$service_directory" "$migrations_directory"
+clojure --report stderr -m ordnungsamt.core "$org" "$service" "$default_branch" "$service_directory" "$migrations_directory"
diff --git a/src/ordnungsamt/core.clj b/src/ordnungsamt/core.clj
@@ -74,7 +74,7 @@
   (sh "git" "stash" "drop" :dir dir))
 
 (defn- local-commit! [title {:keys [modified deleted added]} dir]
-  (run! (fn [file] (utils/sh! "git" "add" file :dir dir))
+  (run! (fn [file] (utils/sh! "git" "add" "-f" file :dir dir))
         (concat modified added))
   (run! (fn [file] (utils/sh! "git" "rm" file :dir dir))
         deleted)