[openssh-commits] [openssh] branch master updated: prepare for checking in autogenerated files

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new bf204bd0 prepare for checking in autogenerated files
bf204bd0 is described below

commit bf204bd05c3ae650f87e2b96527688579f59774c
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Thu Jun 13 15:00:28 2024 +1000

    prepare for checking in autogenerated files
    
    We plan to check in automatically generated files (config.h.in, etc) on
    release branches. These files are normally ignored by .gitignore, but
    this shuffles the contents of this file to make it easy to un-ignore
    them.
---
 .gitignore | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7fccc6fe..21304165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,14 @@
 Makefile
 buildpkg.sh
 config.h
-config.h.in
 config.h.in~
 config.log
 config.status
-configure
-aclocal.m4
 openbsd-compat/Makefile
 openbsd-compat/regress/Makefile
 openssh.xml
 opensshd.init
 survey.sh
-**/*.0
 **/*.o
 **/*.lo
 **/*.so
@@ -36,3 +32,10 @@ sshd
 !regress/misc/fuzz-harness/Makefile
 !regress/unittests/sshsig/Makefile
 tags
+
+# Ignored on main branch
+config.h.in
+configure
+aclocal.m4
+ChangeLog
+**/*.0

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.