From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 2 Sep 2021 12:33:55 +0000 (+0200)
Subject: gitignore: only ignore *local*.conf" under mkosi.default.d/
X-Git-Tag: v250-rc1~732^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ad92aaf901a47bc96cb42192f26f03c48fbd702;p=thirdparty%2Fsystemd.git

gitignore: only ignore *local*.conf" under mkosi.default.d/

The pattern was added in 6242cda99d9194efec20997697d703c0c005dbd4, with the
idea that users will have local configuration files for mkosi and git should
not bother them about those. But let's make this narrower, and only match
files with "local". This way we reduce the risk that some unrelated file
will be ignored by accident.

.gitignore in the parent directory is used, because mkosi apparently tries
to load all files under mkosi.default.d/, without looking at the extension.
This is probably something to fix in mkosi too.
---

diff --git a/.gitignore b/.gitignore
index d6f6caca55e..cc7d3aa41ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,6 @@ __pycache__/
 /mkosi.builddir/
 /mkosi.output/
 /mkosi.default
-mkosi.default.d/*
-!mkosi.default.d/10-systemd.conf
+# Ignore any mkosi config files with "local" in the name
+/mkosi.default.d/*local*.conf
 /tags