msetup: Restore .gitignore after wipe

4 years ago · d9b9eecd54
parent b3a76fea64
commit d9b9eecd54
2 changed files with 2 additions and 0 deletions
--- a/mesonbuild/msetup.py
+++ b/mesonbuild/msetup.py
@ -101,6 +101,7 @@ class MesonApp:
                        else:
                            mesonlib.windows_proof_rm(l)
                finally:
+                    self.add_vcs_ignore_files(self.build_dir)
                    for b, f in restore:
                        os.makedirs(os.path.dirname(f), exist_ok=True)
                        shutil.move(b, f)
--- a/run_unittests.py
+++ b/run_unittests.py
@ -4337,6 +4337,7 @@ class AllPlatformTests(BasePlatformTests):
        self.assertRegex(out, 'opt2 val2')
        self.assertRegex(out, 'opt3 val3')
        self.assertRegex(out, 'opt4 val4')
+        self.assertTrue(Path(self.builddir, '.gitignore').exists())
        self.build()
        self.run_tests()