[02/11] gitignore: Remove entries duplicating global entries

Commit Message

Elliott Mitchell Sept. 1, 2020, 10:02 p.m. UTC

As "config.cache", "config.log" and "config.status" already have global
matching patterns, remove these subdirectory entries.

"autom4te.cache/" similarly had a global match, so remove those
duplicates.

"*.py[ocd]", "*.tmp" and "*.bin" were present, go after their duplicates
too.

"docs/txt/" covers "docs/txt/misc/*.txt" and "docs/txt/man/*.txt".

Signed-off-by: Elliott Mitchell <[e-mail]>

---
 .gitignore | 17 -----------------
 1 file changed, 17 deletions(-)

Comments

Jan Beulich Sept. 10, 2020, 9:20 a.m. UTC | #1

On 02.09.2020 00:02, Elliott Mitchell wrote:
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,6 +1,5 @@
>  .hg
>  .*.cmd
> -.*.tmp

When the shell expands *.tmp, any .*.tmp won't match. Is this different
for git? (Probably it is, seeing that we only have *.d and *.d2, but I'd
still like to double check.)

Jan

Elliott Mitchell Sept. 10, 2020, 6:12 p.m. UTC | #2

On Thu, Sep 10, 2020 at 11:20:11AM +0200, Jan Beulich wrote:
> On 02.09.2020 00:02, Elliott Mitchell wrote:
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -1,6 +1,5 @@
> >  .hg
> >  .*.cmd
> > -.*.tmp
> 
> When the shell expands *.tmp, any .*.tmp won't match. Is this different
> for git? (Probably it is, seeing that we only have *.d and *.d2, but I'd
> still like to double check.)

`git --version` => "git version 2.20.1"
`git check-ignore -vn .foo.tmp`  =>  ".gitignore:23:*.tmp     .foo.tmp"
`git check-ignore -vn foo.tmp`   =>  ".gitignore:23:*.tmp     foo.tmp"
`git check-ignore -vn .tmp`      =>  ".gitignore:23:*.tmp     .tmp"
`git check-ignore -vn .foo`      =>  "::      .foo"

A shell will not expand "*" at the start to a filename starting with a
period, but `git` will (at least as of the version I've got).

Patch

diff --git a/.gitignore b/.gitignore
index 429a484ecc..0f0e79b6d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@ 
 .hg
 .*.cmd
-.*.tmp
 *.orig
 *~
 *.swp
@@ -58,11 +57,7 @@  docs/txt/
 extras/mini-os*
 install/*
 stubdom/*-minios-config.mk
-stubdom/autom4te.cache/
 stubdom/binutils-*
-stubdom/config.cache
-stubdom/config.log
-stubdom/config.status
 stubdom/cross-root-*
 stubdom/gcc-*
 stubdom/gmp-*
@@ -94,11 +89,7 @@  stubdom/vtpm/vtpm_manager.h
 stubdom/xenstore
 stubdom/zlib-*
 tools/*/build/lib*/*.py
-tools/autom4te.cache/
 tools/config.h
-tools/config.log
-tools/config.status
-tools/config.cache
 config/Tools.mk
 config/Stubdom.mk
 config/Docs.mk
@@ -128,7 +119,6 @@  tools/debugger/gdb/gdb-6.2.1.tar.bz2
 tools/debugger/gdbsx/gdbsx
 tools/debugger/xenitp/xenitp
 tools/firmware/*/biossums
-tools/firmware/*.bin
 tools/firmware/*.sym
 tools/firmware/*bios/*bios*.txt
 tools/firmware/etherboot/gpxe/*
@@ -213,8 +203,6 @@  tools/security/secpol_tool
 tools/security/xen/*
 tools/security/xensec_tool
 tools/tests/depriv/depriv-fd-checker
-tools/tests/x86_emulator/*.bin
-tools/tests/x86_emulator/*.tmp
 tools/tests/x86_emulator/32/x86_emulate
 tools/tests/x86_emulator/3dnow*.[ch]
 tools/tests/x86_emulator/asm
@@ -272,7 +260,6 @@  xen/arch/x86/asm-macros.i
 xen/arch/x86/boot/mkelf32
 xen/arch/x86/boot/cmdline.S
 xen/arch/x86/boot/reloc.S
-xen/arch/x86/boot/*.bin
 xen/arch/x86/boot/*.lnk
 xen/arch/x86/efi.lds
 xen/arch/x86/efi/check.efi
@@ -325,7 +312,6 @@  tools/firmware/rombios/_rombios_.c
 tools/firmware/rombios/rombios.s
 tools/firmware/rombios/rombios.sym
 tools/include/xen-foreign/checker.c
-tools/include/xen-foreign/structs.pyc
 tools/include/xen-foreign/x86_32.h
 tools/include/xen-foreign/x86_64.h
 tools/include/xen-foreign/arm32.h
@@ -337,7 +323,6 @@  tools/libxc/_*.[ch]
 tools/libxl/_*.[ch]
 tools/libxl/testidl
 tools/libxl/testidl.c
-tools/libxl/*.pyc
 tools/libxl/libxl-save-helper
 tools/libxl/test_timedereg
 tools/libxl/test_fdderegrace
@@ -382,6 +367,4 @@  tools/xenstore/xenstore-watch
 tools/xl/_paths.h
 tools/xl/xl
 
-docs/txt/misc/*.txt
-docs/txt/man/*.txt
 docs/figs/*.png