Daniel Kiper has asked me to provide the following set of four patches:
1. Split patterns into two groups.
2. Alphabetically sort the patterns within each group.
3. Add slash to patterns which should have one.
4. Add missing patterns.
However, I found that there was one step missing on the way to an
easily readable .gitignore file, so I have added that additional
step before the first one:
0. Add leading slash to all existing slash patterns.
1. Split patterns into two groups.
2. Alphabetically sort the patterns within each group.
3. Add slash(es) to patterns which should have one.
4. Add missing patterns.
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 v2 of an older patchset v1 which achieved
mostly the same thing, but with a few notable differences:
* Consistently add leading slashes to all .gitignore-relative
patterns as the first patch in the series.
* When sorting, use (and keep) the sorting order according to
"LC_ALL=C sort".
* Stop introducing a typo: "grub_probe_inti.h" should have been
"grub_prove_init_h" all the time.
* Add trailing slash for the directory matching pattern "/gnulib/"
which I had previously forgotten.
* The commit messages mention the two pattern groups in the same
order as they appear inside the .gitignore file.
None of that is a catastrophe which cannot be fixed later, but as
there have not been an pushes of v1 yet, you might as well push v2.
Hans Ulrich Niedermann (5):
gitignore: Consistent leading slash is easier to read
gitignore: Group patterns with and without slash
gitignore: Sort both pattern groups alphabetically
gitignore: Add leading slashes where appropriate
gitignore: Add a few forgotten file patterns
.gitignore | 458 +++++++++++++++++++++++++++++------------------------
1 file changed, 247 insertions(+), 211 deletions(-)
Interdiff:
diff --git a/.gitignore b/.gitignore
index 678e829aa..89bd33f29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,9 @@
*.pp
*.trs
*~
-.deps/
.deps-core/
.deps-util/
+.deps/
.dirstamp
DISTLIST
GPATH
@@ -40,7 +40,7 @@ grub-macho2img
grub_emu_init.c
grub_emu_init.h
grub_probe_init.c
-grub_probe_inti.h
+grub_probe_init.h
grub_script.tab.c
grub_script.tab.h
grub_script.yy.c
@@ -63,6 +63,10 @@ widthspec.bin
/40_custom
/41_custom
/ABOUT-NLS
+/ChangeLog
+/INSTALL.grub
+/Makefile.util.am
+/Makefile.utilgcry.def
/aclocal.m4
/ahci_test
/ascii.h
@@ -73,7 +77,6 @@ widthspec.bin
/build-grub-gen-widthspec
/build-grub-mkfont
/cdboot_test
-/ChangeLog
/cmp_test
/compile
/config-util.h
@@ -108,18 +111,11 @@ widthspec.bin
/garbage-gen
/garbage-gen.exe
/gettext_strings_test
-/gnulib
+/gnulib/
/grub-2.[0-9]*/
/grub-2.[0-9]*.tar.gz
/grub-bios-setup
/grub-bios-setup.exe
-/grub_cmd_date
-/grub_cmd_echo
-/grub_cmd_regexp
-/grub_cmd_set_date
-/grub_cmd_sleep
-/grub_cmd_test
-/grub_cmd_tr
/grub-core/*.module
/grub-core/*.module.exe
/grub-core/*.pp
@@ -152,9 +148,6 @@ widthspec.bin
/grub-fs-tester
/grub-fstest
/grub-fstest.exe
-/grub_fstest_init.c
-/grub_fstest_init.h
-/grub_func_test
/grub-glue-efi
/grub-glue-efi.exe
/grub-install
@@ -175,6 +168,23 @@ widthspec.bin
/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_cmd_test
+/grub_cmd_tr
+/grub_fstest_init.c
+/grub_fstest_init.h
+/grub_func_test
/grub_script_blanklines
/grub_script_blockarg
/grub_script_break
@@ -198,35 +208,25 @@ widthspec.bin
/grub_script_setparams
/grub_script_shift
/grub_script_strcmp
+/grub_script_test
/grub_script_vars1
/grub_script_while1
-/grub_script_test
-/grub-set-default
-/grub-shell
-/grub-shell-tester
-/grub-sparc64-setup
-/grub-sparc64-setup.exe
-/grub-syslinux2cfg
-/grub-syslinux2cfg.exe
/gzcompress_test
/hddboot_test
/help_test
/hfs_test
/hfsplus_test
-/INSTALL.grub
-/install-sh
/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
/m4/
-/Makefile.util.am
-/Makefile.utilgcry.def
/minixfs_test
/missing
/netboot_test
--
2.26.2
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
