From 4befe0a802a1c0ff13d302353d41ecb53b98b6ea Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 22 Aug 2021 13:54:04 -0700
Subject: [PATCH] maint: .gitignore updates

* .gitignore: Remove lib/unused-parameter.h.  Add all of m4, since
no files there need to be committed; this lets us remove
m4/.gitignore and m4/gnulib-cache.m4.  Add *.orig, *.patch, .Tpo,
/*.diff, lib/*/ (which lets us remove /lib/sys/), lib/ctype.h,
lib/errno.h, lib/float.h, lib/fnmatch.h, lib/getopt-cdefs.h,
lib/getopt.h, lib/limits.h, lib/sigsegv.h, lib/stdalign.h,
lib/stdarg.h, lib/stdbool.h, lib/stddef.h, lib/stdint.h,
lib/stdopen.[ch], vc-dwim-log-*.  Add slashes to autom4te.cache,
build-aux.  Remove redundant initial slashes from patterns that
also have internal slashes.  Remove plain ABOUT-NLS, since
/ABOUT-NLS suffices.  Sort using LC_ALL=C.
---
 .gitignore | 139 +++++++++++++++++++++++++++++------------------------
 1 file changed, 77 insertions(+), 62 deletions(-)

diff --git a/.gitignore b/.gitignore
index d09d58f..6735488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,21 @@
 *.a
 *.exe
 *.o
+*.orig
+*.patch
 *~
+.Tpo
 .deps
 .dirstamp
 .gdb-history
+/*.diff
 /ABOUT-NLS
 /GNUmakefile
 /INSTALL
 /README-release
 /aclocal.m4
-/build-aux
+/autom4te.cache/
+/build-aux/
 /confdefs*
 /config.cache
 /config.log
@@ -18,79 +23,88 @@
 /configure
 /conftest*
 /diffutils-*.tar.xz
-/doc/.gitignore
-/doc/diffutils.aux
-/doc/diffutils.cp
-/doc/diffutils.cps
-/doc/diffutils.info
-/doc/diffutils.log
-/doc/diffutils.toc
-/doc/stamp-vti
-/doc/version.texi
 /gnulib-tests
-/gnulib-tests/.gitignore
-/gnulib-tests/locale/
-/gnulib-tests/uniwidth/
-/lib/.gitignore
-/lib/alloca.h
-/lib/c++defs.h
-/lib/charset.alias
-/lib/config.h
-/lib/config.hin
-/lib/configmake.h
-/lib/fcntl.h
-/lib/iconv*.h
-/lib/inttypes.h
-/lib/langinfo.h
-/lib/locale.h
-/lib/ref-add.sed
-/lib/ref-del.sed
-/lib/signal.h
-/lib/stamp-h1
-/lib/stdio.h
-/lib/stdlib.h
-/lib/string.h
-/lib/strings.h
-/lib/sys/
-/lib/time.h
-/lib/unistd.h
-/lib/unistr
-/lib/unistr.h
-/lib/unitypes.h
-/lib/uniwidth
-/lib/uniwidth.h
-/lib/unused-parameter.h
-/lib/warn-on-use.h
-/lib/wchar.h
-/lib/wctype.h
-/m4/.gitignore
-/m4/gnulib-cache.m4
+/m4/
 /maint.mk
-/po/*.pot
-/po/*.sed
-/po/.gitignore
-/po/.reference
-/po/LINGUAS
-/po/Makefile.in.in
-/po/Makevars
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/stamp-po
-ABOUT-NLS
 ChangeLog
 ID
 Makefile
 Makefile.in
 TAGS
-autom4te.cache
-build-aux
+doc/.gitignore
+doc/diffutils.aux
+doc/diffutils.cp
+doc/diffutils.cps
+doc/diffutils.info
+doc/diffutils.log
+doc/diffutils.toc
+doc/stamp-vti
+doc/version.texi
 gnulib-tests/*.log
+gnulib-tests/.gitignore
+gnulib-tests/locale/
+gnulib-tests/uniwidth/
+lib/*/
+lib/.gitignore
+lib/alloca.h
 lib/arg-nonnull.h
-lib/link-warning.h
+lib/c++defs.h
+lib/charset.alias
+lib/config.h
+lib/config.hin
+lib/configmake.h
+lib/ctype.h
+lib/errno.h
+lib/fcntl.h
+lib/float.h
+lib/fnmatch.h
+lib/getopt-cdefs.h
+lib/getopt.h
+lib/iconv*.h
+lib/inttypes.h
+lib/langinfo.h
+lib/limits.h
+lib/locale.h
+lib/ref-add.sed
+lib/ref-del.sed
+lib/signal.h
+lib/sigsegv.h
+lib/stamp-h1
+lib/stdalign.h
+lib/stdarg.h
+lib/stdbool.h
+lib/stddef.h
+lib/stdint.h
+lib/stdio.h
+lib/stdlib.h
+# For some reason 'bootstrap' doesn't add /stdopen.[ch] to lib/.gitignore.
+lib/stdopen.[ch]
+lib/string.h
+lib/strings.h
+lib/time.h
+lib/unistd.h
+lib/unistr
+lib/unistr.h
+lib/unitypes.h
+lib/uniwidth
+lib/uniwidth.h
+lib/warn-on-use.h
+lib/wchar.h
+lib/wctype.h
 man/*.1
 po/*.gmo
 po/*.po
+po/*.pot
+po/*.sed
+po/.gitignore
+po/.reference
+po/LINGUAS
+po/Makefile.in.in
+po/Makevars
+po/Makevars.template
+po/POTFILES
+po/Rules-quot
+po/stamp-po
 src/cmp
 src/diff
 src/diff3
@@ -99,3 +113,4 @@ src/sdiff
 src/version.[ch]
 tests/*.log
 tests/*.trs
+vc-dwim-log-*