From: Jonathan Lebon <jonathan@jlebon.com>
Date: Thu, 23 Jul 2026 15:17:54 +0000 (-0400)
Subject: tree: Go back to git.mk-generated .gitignore
X-Git-Tag: archive/raspbian/2026.4-1+rpi1^2~9^2~1^2~17^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f9a659b53aae92098d643640006d2bf5d7bb094;p=ostree.git

tree: Go back to git.mk-generated .gitignore

Commit b0cd80d9 ("ci: Add Packit CI with RPM builds and TMT integration
tests") added an in-tree .gitignore which trips up the `git.mk` bits
which normally generate it. And so then build artifacts showed up all as
untracked files.

Go back to keeping `.gitignore` untracked and instead add `.cosa` to
`GITIGNOREFILES` to retain the original entries that b0cd80d9 added.
---

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index dd033746..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.cosa
-_kola_temp
-
-# Added by cargo
-/target
diff --git a/Makefile.am b/Makefile.am
index 424b2853..3040baaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make
 GITIGNOREFILES += ci-build/
 
 # Generated by coreos-assembler build-fast and kola
-GITIGNOREFILES += fastbuild-*.qcow2 _kola_temp/
+GITIGNOREFILES += fastbuild-*.qcow2 _kola_temp/ .cosa/
 
 # Rust stuff
 GITIGNOREFILES += target/ Cargo.lock