Skip to contentSkip to conversation

gitignore: Clean up most of the gitignore mess

PATCH Superseded Hans Ulrich Niedermann 1 participant 7 messages May 7, 2020

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover gitignore: Clean up most of the gitignore mess

This cleans up most of the gitignore mess according to Daniel Kiper's suggestions:

1. Consistently add leading slash to all patterns matching relative to .gitignore
2. Group patterns matching everywhere in the subtree and patterns matching relative to .gitignore
3. Sort both pattern groups alphabetically
4. Add trailing slashes to patterns matching directories
5. Add leading slash where it has been forgotten
6. Add a few patterns matching files which have been forgotten

Some of the remaining non-slash patterns (i.e. those matching anywhere in the directory tree) might work with a leading slash, but I could not research all of them (especially for old code and optionally built files), so I have left those for now.

This is a revised version v3 of the older patchset v2 which achieves mostly the same result, but with the following differences:

* Add a leading slash to /contrib as well, judging from autogen.sh.

* Split adding slashes to patterns into one patch each for leading slashes and one for trailing slashes.

* Add

as Daniel Kiper has asked me to do after splitting trailing and leading slashes.

Hans Ulrich Niedermann (6):
gitignore: Consistent leading slash is easier to read
gitignore: Group patterns with and without slash
gitignore: Sort both pattern groups alphabetically
gitignore: Add trailing slashes for directories
gitignore: Add leading slashes where appropriate
gitignore: Add a few forgotten file patterns

 .gitignore | 458 +++++++++++++++++++++++++++++------------------------
 1 file changed, 247 insertions(+), 211 deletions(-)

Interdiff:

.gitignore +1 -1
index 89bd33f29..aa180fa89 100644
@@ -28,7 +28,6 @@ GTAGS
 Makefile
 Makefile.in
 ascii.bitmaps
-contrib
 genkernsyms.sh
 gensymlist.sh
 grub-bin2h
@@ -88,6 +87,7 @@ widthspec.bin
 /config.status
 /config.sub
 /configure
+/contrib
 /core_compress_test
 /cpio_test
 /date_test
Signature · 1 line
2.26.2
#1 lore raw

PATCH v3 1/6 gitignore: Consistent leading slash is easier to read

As all gitignore patterns containing a left or middle slash match only relative to the .gitignore file's directory, we write them all in the same manner with a leading slash.

This makes the file significantly easier to read.

---
 .gitignore | 88 +++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)
.gitignore +44 -44
index 819cd185d..8908a2131 100644
@@ -30,9 +30,9 @@ config.sub
 configure
 core_compress_test
 DISTLIST
-docs/*.info
-docs/stamp-vti
-docs/version.texi
+/docs/*.info
+/docs/stamp-vti
+/docs/version.texi
 ehci_test
 example_grub_script_test
 example_scripted_test
@@ -81,7 +81,7 @@ grub-macho2img
 grub-mount
 /grub-ofpathname
 /grub-ofpathname.exe
-grub-core/build-grub-pe2elf.exe
+/grub-core/build-grub-pe2elf.exe
 /grub-probe
 /grub-probe.exe
 grub_probe_init.c
@@ -136,11 +136,11 @@ help_test
 *.img
 *.image
 *.image.exe
-include/grub/cpu
-include/grub/machine
+/include/grub/cpu
+/include/grub/machine
 INSTALL.grub
 install-sh
-lib/libgcrypt-grub
+/lib/libgcrypt-grub
 libgrub_a_init.c
 *.log
 *.lst
@@ -159,14 +159,14 @@ partmap_test
 pata_test
 *.pf2
 *.pp
-po/*.mo
-po/grub.pot
-po/Makefile.in.in
-po/Makevars
-po/Makevars.template
-po/POTFILES
-po/Rules-quot
-po/stamp-po
+/po/*.mo
+/po/grub.pot
+/po/Makefile.in.in
+/po/Makevars
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/stamp-po
 printf_test
 priority_queue_unit_test
 pseries_test
@@ -190,43 +190,43 @@ compile
 depcomp
 mdate-sh
 texinfo.tex
-grub-core/lib/libgcrypt-grub
+/grub-core/lib/libgcrypt-grub
 .deps
 .deps-util
 .deps-core
 .dirstamp
 Makefile.util.am
 contrib
-grub-core/bootinfo.txt
-grub-core/Makefile.core.am
-grub-core/Makefile.gcry.def
-grub-core/contrib
-grub-core/gdb_grub
-grub-core/genmod.sh
-grub-core/gensyminfo.sh
-grub-core/gmodule.pl
-grub-core/grub.chrp
-grub-core/modinfo.sh
-grub-core/*.module
-grub-core/*.module.exe
-grub-core/*.pp
-grub-core/kernel.img.bin
-util/bash-completion.d/grub
-grub-core/lib/gnulib
-grub-core/rs_decoder.h
+/grub-core/bootinfo.txt
+/grub-core/Makefile.core.am
+/grub-core/Makefile.gcry.def
+/grub-core/contrib
+/grub-core/gdb_grub
+/grub-core/genmod.sh
+/grub-core/gensyminfo.sh
+/grub-core/gmodule.pl
+/grub-core/grub.chrp
+/grub-core/modinfo.sh
+/grub-core/*.module
+/grub-core/*.module.exe
+/grub-core/*.pp
+/grub-core/kernel.img.bin
+/util/bash-completion.d/grub
+/grub-core/lib/gnulib
+/grub-core/rs_decoder.h
 widthspec.bin
 widthspec.h
-docs/stamp-1
-docs/version-dev.texi
+/docs/stamp-1
+/docs/version-dev.texi
 Makefile.utilgcry.def
-po/*.po
-po/*.gmo
-po/LINGUAS
-po/remove-potcdate.sed
-include/grub/gcrypt/gcrypt.h
-include/grub/gcrypt/g10lib.h
-po/POTFILES.in
-po/POTFILES-shell.in
+/po/*.po
+/po/*.gmo
+/po/LINGUAS
+/po/remove-potcdate.sed
+/include/grub/gcrypt/gcrypt.h
+/include/grub/gcrypt/g10lib.h
+/po/POTFILES.in
+/po/POTFILES-shell.in
 /grub-glue-efi
 /grub-render-label
 /grub-glue-efi.exe
@@ -234,4 +234,4 @@ po/POTFILES-shell.in
 /garbage-gen
 /garbage-gen.exe
 /grub-fs-tester
-grub-core/build-grub-module-verifier
+/grub-core/build-grub-module-verifier
Signature · 1 line
2.26.2
#2 lore raw

PATCH v3 2/6 gitignore: Group patterns with and without slash

In reply to Hans Ulrich Niedermann

Group the .gitignore patterns into two groups:

* Pattern not including a slash, i.e. matching files anywhere in the .gitignore file's directory and all of its subdirectories.

* Patterns including a slash, i.e. matching only relative to the .gitignore file's directory.

---
 .gitignore | 81 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)
.gitignore +42 -39
index 8908a2131..01c1ec538 100644
@@ -1,3 +1,4 @@
+# Ignore patterns in this directory and all subdirectories
 *~
 00_header
 10_*
@@ -30,9 +31,6 @@ config.sub
 configure
 core_compress_test
 DISTLIST
-/docs/*.info
-/docs/stamp-vti
-/docs/version.texi
 ehci_test
 example_grub_script_test
 example_scripted_test
@@ -45,25 +43,18 @@ gensymlist.sh
 gentrigtables
 gentrigtables.exe
 gettext_strings_test
-/gnulib
 grub-bin2h
-/grub-bios-setup
-/grub-bios-setup.exe
 grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
 grub_cmd_set_date
 grub_cmd_sleep
-/grub-editenv
-/grub-editenv.exe
 grub-emu
 grub-emu-lite
 grub-emu.exe
 grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
-/grub-file
-/grub-file.exe
 grub-fstest
 grub-fstest.exe
 grub_fstest_init.c
@@ -72,21 +63,10 @@ grub_func_test
 grub-install
 grub-install.exe
 grub-kbdcomp
-/grub-macbless
-/grub-macbless.exe
 grub-macho2img
-/grub-menulst2cfg
-/grub-menulst2cfg.exe
-/grub-mk*
 grub-mount
-/grub-ofpathname
-/grub-ofpathname.exe
-/grub-core/build-grub-pe2elf.exe
-/grub-probe
-/grub-probe.exe
 grub_probe_init.c
 grub_probe_init.h
-/grub-reboot
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
@@ -128,26 +108,20 @@ grub-shell
 grub-shell-tester
 grub-sparc64-setup
 grub-sparc64-setup.exe
-/grub-syslinux2cfg
-/grub-syslinux2cfg.exe
 gzcompress_test
 hddboot_test
 help_test
 *.img
 *.image
 *.image.exe
-/include/grub/cpu
-/include/grub/machine
 INSTALL.grub
 install-sh
-/lib/libgcrypt-grub
 libgrub_a_init.c
 *.log
 *.lst
 lzocompress_test
 *.marker
 Makefile
-/m4
 *.mod
 mod-*.c
 missing
@@ -159,14 +133,6 @@ partmap_test
 pata_test
 *.pf2
 *.pp
-/po/*.mo
-/po/grub.pot
-/po/Makefile.in.in
-/po/Makevars
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/stamp-po
 printf_test
 priority_queue_unit_test
 pseries_test
@@ -190,13 +156,53 @@ compile
 depcomp
 mdate-sh
 texinfo.tex
-/grub-core/lib/libgcrypt-grub
 .deps
 .deps-util
 .deps-core
 .dirstamp
 Makefile.util.am
 contrib
+widthspec.bin
+widthspec.h
+Makefile.utilgcry.def
+
+# Ignore patterns relative to this .gitignore file's directory
+/docs/*.info
+/docs/stamp-vti
+/docs/version.texi
+/gnulib
+/grub-bios-setup
+/grub-bios-setup.exe
+/grub-editenv
+/grub-editenv.exe
+/grub-file
+/grub-file.exe
+/grub-macbless
+/grub-macbless.exe
+/grub-menulst2cfg
+/grub-menulst2cfg.exe
+/grub-mk*
+/grub-ofpathname
+/grub-ofpathname.exe
+/grub-core/build-grub-pe2elf.exe
+/grub-probe
+/grub-probe.exe
+/grub-reboot
+/grub-syslinux2cfg
+/grub-syslinux2cfg.exe
+/include/grub/cpu
+/include/grub/machine
+/lib/libgcrypt-grub
+/m4
+/po/*.mo
+/po/grub.pot
+/po/Makefile.in.in
+/po/Makevars
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/stamp-po
+/grub-core/lib/libgcrypt-grub
 /grub-core/bootinfo.txt
 /grub-core/Makefile.core.am
 /grub-core/Makefile.gcry.def
@@ -214,11 +220,8 @@ contrib
 /util/bash-completion.d/grub
 /grub-core/lib/gnulib
 /grub-core/rs_decoder.h
-widthspec.bin
-widthspec.h
 /docs/stamp-1
 /docs/version-dev.texi
-Makefile.utilgcry.def
 /po/*.po
 /po/*.gmo
 /po/LINGUAS
Signature · 1 line
2.26.2
#3 lore raw

PATCH v3 3/6 gitignore: Sort both pattern groups alphabetically

In reply to Hans Ulrich Niedermann

Alphabetically sort the two groups of gitignore patterns:

* The group of patterns without slashes, matching anywhere in the directory subtree.

* The group of patterns with slashes, matching relative to the .gitignore file's directory

---
 .gitignore | 200 ++++++++++++++++++++++++++---------------------------
 1 file changed, 100 insertions(+), 100 deletions(-)
.gitignore +100 -100
index 01c1ec538..7e1d32df4 100644
@@ -1,14 +1,42 @@
 # Ignore patterns in this directory and all subdirectories
+*.1
+*.8
+*.a
+*.exec
+*.exec.exe
+*.image
+*.image.exe
+*.img
+*.log
+*.lst
+*.marker
+*.mod
+*.o
+*.pf2
+*.pp
+*.trs
 *~
+.deps
+.deps-core
+.deps-util
+.dirstamp
 00_header
 10_*
 20_linux_xen
 30_os-prober
 40_custom
 41_custom
-*.1
-*.8
 ABOUT-NLS
+DISTLIST
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+INSTALL.grub
+Makefile
+Makefile.in
+Makefile.util.am
+Makefile.utilgcry.def
 aclocal.m4
 ahci_test
 ascii.bitmaps
@@ -20,23 +48,23 @@ build-grub-gen-widthspec
 build-grub-mkfont
 cdboot_test
 cmp_test
+compile
+config-util.h
+config-util.h.in
 config.cache
 config.guess
 config.h
-config-util.h
-config-util.h.in
 config.log
 config.status
 config.sub
 configure
+contrib
 core_compress_test
-DISTLIST
+depcomp
 ehci_test
 example_grub_script_test
 example_scripted_test
 example_unit_test
-*.exec
-*.exec.exe
 fddboot_test
 genkernsyms.sh
 gensymlist.sh
@@ -44,34 +72,43 @@ gentrigtables
 gentrigtables.exe
 gettext_strings_test
 grub-bin2h
-grub_cmd_date
-grub_cmd_echo
-grub_cmd_regexp
-grub_cmd_set_date
-grub_cmd_sleep
 grub-emu
 grub-emu-lite
-grub-emu.exe
 grub-emu-lite.exe
-grub_emu_init.c
-grub_emu_init.h
+grub-emu.exe
 grub-fstest
 grub-fstest.exe
-grub_fstest_init.c
-grub_fstest_init.h
-grub_func_test
 grub-install
 grub-install.exe
 grub-kbdcomp
 grub-macho2img
 grub-mount
+grub-script-check
+grub-script-check.exe
+grub-set-default
+grub-shell
+grub-shell-tester
+grub-sparc64-setup
+grub-sparc64-setup.exe
+grub_cmd_date
+grub_cmd_echo
+grub_cmd_regexp
+grub_cmd_set_date
+grub_cmd_sleep
+grub_emu_init.c
+grub_emu_init.h
+grub_fstest_init.c
+grub_fstest_init.h
+grub_func_test
 grub_probe_init.c
 grub_probe_init.h
+grub_script.tab.c
+grub_script.tab.h
+grub_script.yy.c
+grub_script.yy.h
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
-grub-script-check
-grub-script-check.exe
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script_comments
@@ -97,86 +134,75 @@ grub_script_strcmp
 grub_script_test
 grub_script_vars1
 grub_script_while1
-grub_script.tab.c
-grub_script.tab.h
-grub_script.yy.c
-grub_script.yy.h
-grub-set-default
 grub_setup_init.c
 grub_setup_init.h
-grub-shell
-grub-shell-tester
-grub-sparc64-setup
-grub-sparc64-setup.exe
 gzcompress_test
 hddboot_test
 help_test
-*.img
-*.image
-*.image.exe
-INSTALL.grub
 install-sh
 libgrub_a_init.c
-*.log
-*.lst
 lzocompress_test
-*.marker
-Makefile
-*.mod
-mod-*.c
+mdate-sh
 missing
+mod-*.c
 netboot_test
-*.o
-*.a
 ohci_test
 partmap_test
 pata_test
-*.pf2
-*.pp
 printf_test
 priority_queue_unit_test
 pseries_test
 stamp-h
-stamp-h1
 stamp-h.in
+stamp-h1
 symlist.c
 symlist.h
+texinfo.tex
 trigtables.c
-*.trs
 uhci_test
-update-grub_lib
 unidata.c
-xzcompress_test
-Makefile.in
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-compile
-depcomp
-mdate-sh
-texinfo.tex
-.deps
-.deps-util
-.deps-core
-.dirstamp
-Makefile.util.am
-contrib
+update-grub_lib
 widthspec.bin
 widthspec.h
-Makefile.utilgcry.def
+xzcompress_test
 
 # Ignore patterns relative to this .gitignore file's directory
 /docs/*.info
+/docs/stamp-1
 /docs/stamp-vti
+/docs/version-dev.texi
 /docs/version.texi
+/garbage-gen
+/garbage-gen.exe
 /gnulib
 /grub-bios-setup
 /grub-bios-setup.exe
+/grub-core/*.module
+/grub-core/*.module.exe
+/grub-core/*.pp
+/grub-core/Makefile.core.am
+/grub-core/Makefile.gcry.def
+/grub-core/bootinfo.txt
+/grub-core/build-grub-module-verifier
+/grub-core/build-grub-pe2elf.exe
+/grub-core/contrib
+/grub-core/gdb_grub
+/grub-core/genmod.sh
+/grub-core/gensyminfo.sh
+/grub-core/gmodule.pl
+/grub-core/grub.chrp
+/grub-core/kernel.img.bin
+/grub-core/lib/gnulib
+/grub-core/lib/libgcrypt-grub
+/grub-core/modinfo.sh
+/grub-core/rs_decoder.h
 /grub-editenv
 /grub-editenv.exe
 /grub-file
 /grub-file.exe
+/grub-fs-tester
+/grub-glue-efi
+/grub-glue-efi.exe
 /grub-macbless
 /grub-macbless.exe
 /grub-menulst2cfg
@@ -184,57 +210,31 @@ Makefile.utilgcry.def
 /grub-mk*
 /grub-ofpathname
 /grub-ofpathname.exe
-/grub-core/build-grub-pe2elf.exe
 /grub-probe
 /grub-probe.exe
 /grub-reboot
+/grub-render-label
+/grub-render-label.exe
 /grub-syslinux2cfg
 /grub-syslinux2cfg.exe
 /include/grub/cpu
+/include/grub/gcrypt/g10lib.h
+/include/grub/gcrypt/gcrypt.h
 /include/grub/machine
 /lib/libgcrypt-grub
 /m4
+/po/*.gmo
 /po/*.mo
-/po/grub.pot
+/po/*.po
+/po/LINGUAS
 /po/Makefile.in.in
 /po/Makevars
 /po/Makevars.template
 /po/POTFILES
+/po/POTFILES-shell.in
+/po/POTFILES.in
 /po/Rules-quot
+/po/grub.pot
+/po/remove-potcdate.sed
 /po/stamp-po
-/grub-core/lib/libgcrypt-grub
-/grub-core/bootinfo.txt
-/grub-core/Makefile.core.am
-/grub-core/Makefile.gcry.def
-/grub-core/contrib
-/grub-core/gdb_grub
-/grub-core/genmod.sh
-/grub-core/gensyminfo.sh
-/grub-core/gmodule.pl
-/grub-core/grub.chrp
-/grub-core/modinfo.sh
-/grub-core/*.module
-/grub-core/*.module.exe
-/grub-core/*.pp
-/grub-core/kernel.img.bin
 /util/bash-completion.d/grub
-/grub-core/lib/gnulib
-/grub-core/rs_decoder.h
-/docs/stamp-1
-/docs/version-dev.texi
-/po/*.po
-/po/*.gmo
-/po/LINGUAS
-/po/remove-potcdate.sed
-/include/grub/gcrypt/gcrypt.h
-/include/grub/gcrypt/g10lib.h
-/po/POTFILES.in
-/po/POTFILES-shell.in
-/grub-glue-efi
-/grub-render-label
-/grub-glue-efi.exe
-/grub-render-label.exe
-/garbage-gen
-/garbage-gen.exe
-/grub-fs-tester
-/grub-core/build-grub-module-verifier
Signature · 1 line
2.26.2
#4 lore raw

PATCH v3 4/6 gitignore: Add trailing slashes for directories

In reply to Hans Ulrich Niedermann

Add trailing slashes for all patterns matching directories.

Note that we do *not* add trailing slashes for *symlinks* to directories.

---
 .gitignore | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
.gitignore +7 -7
index 7e1d32df4..7db3a18e5 100644
@@ -16,9 +16,9 @@
 *.pp
 *.trs
 *~
-.deps
-.deps-core
-.deps-util
+.deps/
+.deps-core/
+.deps-util/
 .dirstamp
 00_header
 10_*
@@ -41,8 +41,8 @@ aclocal.m4
 ahci_test
 ascii.bitmaps
 ascii.h
-autom4te.cache
-build-aux
+autom4te.cache/
+build-aux/
 build-grub-gen-asciih
 build-grub-gen-widthspec
 build-grub-mkfont
@@ -174,7 +174,7 @@ xzcompress_test
 /docs/version.texi
 /garbage-gen
 /garbage-gen.exe
-/gnulib
+/gnulib/
 /grub-bios-setup
 /grub-bios-setup.exe
 /grub-core/*.module
@@ -222,7 +222,7 @@ xzcompress_test
 /include/grub/gcrypt/gcrypt.h
 /include/grub/machine
 /lib/libgcrypt-grub
-/m4
+/m4/
 /po/*.gmo
 /po/*.mo
 /po/*.po
Signature · 1 line
2.26.2
#5 lore raw

PATCH v3 5/6 gitignore: Add leading slashes where appropriate

In reply to Hans Ulrich Niedermann

Going through the list of gitignore patterns without a leading slash, this adds a leading slash where it appears to have been forgotten.

Some gitignore patterns like ".deps/" or "Makefile" clearly should match everywhere, so those definitively need no leading slash.

For some patterns like "ascii.bitmaps", it is unclear where in the source tree they should match. Those patterns are kept as they are, matching the patterns in the whole tree of subdirectories.

---
 .gitignore | 229 +++++++++++++++++++++++++++--------------------------
 1 file changed, 115 insertions(+), 114 deletions(-)
.gitignore +115 -114
index 7db3a18e5..809e69dbc 100644
@@ -16,164 +16,90 @@
 *.pp
 *.trs
 *~
-.deps/
 .deps-core/
 .deps-util/
+.deps/
 .dirstamp
-00_header
-10_*
-20_linux_xen
-30_os-prober
-40_custom
-41_custom
-ABOUT-NLS
 DISTLIST
 GPATH
 GRTAGS
 GSYMS
 GTAGS
-INSTALL.grub
 Makefile
 Makefile.in
-Makefile.util.am
-Makefile.utilgcry.def
-aclocal.m4
-ahci_test
 ascii.bitmaps
-ascii.h
-autom4te.cache/
-build-aux/
-build-grub-gen-asciih
-build-grub-gen-widthspec
-build-grub-mkfont
-cdboot_test
-cmp_test
-compile
-config-util.h
-config-util.h.in
-config.cache
-config.guess
-config.h
-config.log
-config.status
-config.sub
-configure
-contrib
-core_compress_test
-depcomp
-ehci_test
-example_grub_script_test
-example_scripted_test
-example_unit_test
-fddboot_test
 genkernsyms.sh
 gensymlist.sh
-gentrigtables
-gentrigtables.exe
-gettext_strings_test
 grub-bin2h
 grub-emu
 grub-emu-lite
 grub-emu-lite.exe
 grub-emu.exe
-grub-fstest
-grub-fstest.exe
-grub-install
-grub-install.exe
-grub-kbdcomp
 grub-macho2img
-grub-mount
-grub-script-check
-grub-script-check.exe
-grub-set-default
-grub-shell
-grub-shell-tester
-grub-sparc64-setup
-grub-sparc64-setup.exe
-grub_cmd_date
-grub_cmd_echo
-grub_cmd_regexp
-grub_cmd_set_date
-grub_cmd_sleep
 grub_emu_init.c
 grub_emu_init.h
-grub_fstest_init.c
-grub_fstest_init.h
-grub_func_test
 grub_probe_init.c
 grub_probe_init.h
 grub_script.tab.c
 grub_script.tab.h
 grub_script.yy.c
 grub_script.yy.h
-grub_script_blanklines
-grub_script_blockarg
-grub_script_break
 grub_script_check_init.c
 grub_script_check_init.h
-grub_script_comments
-grub_script_continue
-grub_script_dollar
-grub_script_echo1
-grub_script_echo_keywords
-grub_script_escape_comma
-grub_script_eval
-grub_script_expansion
-grub_script_final_semicolon
-grub_script_for1
-grub_script_functions
-grub_script_gettext
-grub_script_if
-grub_script_leading_whitespace
-grub_script_no_commands
-grub_script_not
-grub_script_return
-grub_script_setparams
-grub_script_shift
-grub_script_strcmp
-grub_script_test
-grub_script_vars1
-grub_script_while1
 grub_setup_init.c
 grub_setup_init.h
-gzcompress_test
-hddboot_test
-help_test
-install-sh
-libgrub_a_init.c
-lzocompress_test
 mdate-sh
-missing
 mod-*.c
-netboot_test
-ohci_test
-partmap_test
-pata_test
-printf_test
-priority_queue_unit_test
-pseries_test
-stamp-h
-stamp-h.in
-stamp-h1
-symlist.c
-symlist.h
-texinfo.tex
-trigtables.c
-uhci_test
-unidata.c
 update-grub_lib
 widthspec.bin
-widthspec.h
-xzcompress_test
 
 # Ignore patterns relative to this .gitignore file's directory
+/00_header
+/10_*
+/20_linux_xen
+/30_os-prober
+/40_custom
+/41_custom
+/ABOUT-NLS
+/INSTALL.grub
+/Makefile.util.am
+/Makefile.utilgcry.def
+/aclocal.m4
+/ahci_test
+/ascii.h
+/autom4te.cache/
+/build-aux/
+/build-grub-gen-asciih
+/build-grub-gen-widthspec
+/build-grub-mkfont
+/cdboot_test
+/cmp_test
+/compile
+/config-util.h
+/config-util.h.in
+/config.cache
+/config.guess
+/config.h
+/config.log
+/config.status
+/config.sub
+/configure
+/contrib
+/core_compress_test
+/depcomp
 /docs/*.info
 /docs/stamp-1
 /docs/stamp-vti
 /docs/version-dev.texi
 /docs/version.texi
+/ehci_test
+/example_grub_script_test
+/example_scripted_test
+/example_unit_test
+/fddboot_test
 /garbage-gen
 /garbage-gen.exe
+/gettext_strings_test
 /gnulib/
 /grub-bios-setup
 /grub-bios-setup.exe
@@ -189,6 +115,8 @@ xzcompress_test
 /grub-core/gdb_grub
 /grub-core/genmod.sh
 /grub-core/gensyminfo.sh
+/grub-core/gentrigtables
+/grub-core/gentrigtables.exe
 /grub-core/gmodule.pl
 /grub-core/grub.chrp
 /grub-core/kernel.img.bin
@@ -196,18 +124,28 @@ xzcompress_test
 /grub-core/lib/libgcrypt-grub
 /grub-core/modinfo.sh
 /grub-core/rs_decoder.h
+/grub-core/symlist.c
+/grub-core/symlist.h
+/grub-core/trigtables.c
+/grub-core/unidata.c
 /grub-editenv
 /grub-editenv.exe
 /grub-file
 /grub-file.exe
 /grub-fs-tester
+/grub-fstest
+/grub-fstest.exe
 /grub-glue-efi
 /grub-glue-efi.exe
+/grub-install
+/grub-install.exe
+/grub-kbdcomp
 /grub-macbless
 /grub-macbless.exe
 /grub-menulst2cfg
 /grub-menulst2cfg.exe
 /grub-mk*
+/grub-mount
 /grub-ofpathname
 /grub-ofpathname.exe
 /grub-probe
@@ -215,14 +153,67 @@ xzcompress_test
 /grub-reboot
 /grub-render-label
 /grub-render-label.exe
+/grub-script-check
+/grub-script-check.exe
+/grub-set-default
+/grub-shell
+/grub-shell-tester
+/grub-sparc64-setup
+/grub-sparc64-setup.exe
 /grub-syslinux2cfg
 /grub-syslinux2cfg.exe
+/grub_cmd_date
+/grub_cmd_echo
+/grub_cmd_regexp
+/grub_cmd_set_date
+/grub_cmd_sleep
+/grub_fstest_init.c
+/grub_fstest_init.h
+/grub_func_test
+/grub_script_blanklines
+/grub_script_blockarg
+/grub_script_break
+/grub_script_comments
+/grub_script_continue
+/grub_script_dollar
+/grub_script_echo1
+/grub_script_echo_keywords
+/grub_script_escape_comma
+/grub_script_eval
+/grub_script_expansion
+/grub_script_final_semicolon
+/grub_script_for1
+/grub_script_functions
+/grub_script_gettext
+/grub_script_if
+/grub_script_leading_whitespace
+/grub_script_no_commands
+/grub_script_not
+/grub_script_return
+/grub_script_setparams
+/grub_script_shift
+/grub_script_strcmp
+/grub_script_test
+/grub_script_vars1
+/grub_script_while1
+/gzcompress_test
+/hddboot_test
+/help_test
 /include/grub/cpu
 /include/grub/gcrypt/g10lib.h
 /include/grub/gcrypt/gcrypt.h
 /include/grub/machine
+/install-sh
 /lib/libgcrypt-grub
+/libgrub_a_init.c
+/lzocompress_test
 /m4/
+/minixfs_test
+/missing
+/netboot_test
+/ohci_test
+/partmap_test
+/pata_test
 /po/*.gmo
 /po/*.mo
 /po/*.po
@@ -237,4 +228,14 @@ xzcompress_test
 /po/grub.pot
 /po/remove-potcdate.sed
 /po/stamp-po
+/printf_test
+/priority_queue_unit_test
+/pseries_test
+/stamp-h
+/stamp-h.in
+/stamp-h1
+/texinfo.tex
+/uhci_test
 /util/bash-completion.d/grub
+/widthspec.h
+/xzcompress_test
Signature · 1 line
2.26.2
#6 lore raw

PATCH v3 6/6 gitignore: Add a few forgotten file patterns

In reply to Hans Ulrich Niedermann

Add a few patterns to .gitignore to cover files which are generated by building grub ("make", "make check", "make dist") but which have been forgotten to add to .gitignore in the past.

---
 .gitignore | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
.gitignore +32 -0
index 809e69dbc..aa180fa89 100644
@@ -58,9 +58,11 @@ widthspec.bin
 /10_*
 /20_linux_xen
 /30_os-prober
+/30_uefi-firmware
 /40_custom
 /41_custom
 /ABOUT-NLS
+/ChangeLog
 /INSTALL.grub
 /Makefile.util.am
 /Makefile.utilgcry.def
@@ -68,6 +70,7 @@ widthspec.bin
 /ahci_test
 /ascii.h
 /autom4te.cache/
+/btrfs_test
 /build-aux/
 /build-grub-gen-asciih
 /build-grub-gen-widthspec
@@ -86,8 +89,11 @@ widthspec.bin
 /configure
 /contrib
 /core_compress_test
+/cpio_test
+/date_test
 /depcomp
 /docs/*.info
+/docs/*.info-[0-9]*
 /docs/stamp-1
 /docs/stamp-vti
 /docs/version-dev.texi
@@ -96,11 +102,18 @@ widthspec.bin
 /example_grub_script_test
 /example_scripted_test
 /example_unit_test
+/exfat_test
+/ext234_test
+/f2fs_test
+/fat_test
 /fddboot_test
+/file_filter_test
 /garbage-gen
 /garbage-gen.exe
 /gettext_strings_test
 /gnulib/
+/grub-2.[0-9]*/
+/grub-2.[0-9]*.tar.gz
 /grub-bios-setup
 /grub-bios-setup.exe
 /grub-core/*.module
@@ -167,6 +180,8 @@ widthspec.bin
 /grub_cmd_regexp
 /grub_cmd_set_date
 /grub_cmd_sleep
+/grub_cmd_test
+/grub_cmd_tr
 /grub_fstest_init.c
 /grub_fstest_init.h
 /grub_func_test
@@ -199,11 +214,15 @@ widthspec.bin
 /gzcompress_test
 /hddboot_test
 /help_test
+/hfs_test
+/hfsplus_test
 /include/grub/cpu
 /include/grub/gcrypt/g10lib.h
 /include/grub/gcrypt/gcrypt.h
 /include/grub/machine
 /install-sh
+/iso9660_test
+/jfs_test
 /lib/libgcrypt-grub
 /libgrub_a_init.c
 /lzocompress_test
@@ -211,6 +230,8 @@ widthspec.bin
 /minixfs_test
 /missing
 /netboot_test
+/nilfs2_test
+/ntfs_test
 /ohci_test
 /partmap_test
 /pata_test
@@ -231,11 +252,22 @@ widthspec.bin
 /printf_test
 /priority_queue_unit_test
 /pseries_test
+/reiserfs_test
+/romfs_test
+/squashfs_test
 /stamp-h
 /stamp-h.in
 /stamp-h1
+/syslinux_test
+/tar_test
+/test_sha512sum
+/test_unset
+/tests/syslinux/ubuntu10.04_grub.cfg
 /texinfo.tex
+/udf_test
 /uhci_test
 /util/bash-completion.d/grub
 /widthspec.h
+/xfs_test
 /xzcompress_test
+/zfs_test
Signature · 1 line
2.26.2