Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jUFJn-0001Jv-7s for mharc-grub-devel@gnu.org; Thu, 30 Apr 2020 15:57:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUFHd-0007ar-BI for grub-devel@gnu.org; Thu, 30 Apr 2020 15:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUFH4-0000Or-7u for grub-devel@gnu.org; Thu, 30 Apr 2020 15:55:44 -0400 Received: from mailout03.mx.bawue.net ([193.7.176.64]:44200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUFH2-0000Ce-Pg for grub-devel@gnu.org; Thu, 30 Apr 2020 15:55:09 -0400 Received: from infty.fritz.box (p5B0825D9.dip0.t-ipconnect.de [91.8.37.217]) (Authenticated sender: pdim@bawue.de) by smtp.bawue.net (Postfix) with ESMTPSA id 107A52037C; Thu, 30 Apr 2020 21:54:59 +0200 (CEST) From: Hans Ulrich Niedermann To: grub-devel@gnu.org Cc: Hans Ulrich Niedermann Subject: [PATCH 0/5 v2] gitignore: Clean up most of the gitignore mess Date: Thu, 30 Apr 2020 21:54:48 +0200 Message-Id: <20200430195454.96888-1-hun@n-dimensional.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanner: SAV Dynamic Interface 2.6.0, Engine: 3.77.1, SAV: 5.74 (DBE9713B) on relay01.mx.bawue.net using milter-sssp 0.1.0 X-Virus-Scan: Found to be clean. Received-SPF: pass client-ip=193.7.176.64; envelope-from=hun@n-dimensional.de; helo=mailout03.mx.bawue.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 15:55:02 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Received-From: 193.7.176.64 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 19:57:57 -0000 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