Skip to contentSkip to conversation

gitignore: Move ignores from global to subdirectories

PATCH In review Elliott Mitchell 2 participants 5 messages Sep 9, 2020 – Sep 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/11 gitignore: Move ignores from global to subdirectories

Subdirectories which have .gitignore files should not be referenced in the global .gitignore files. Move several lines to appropriate subdirs.

When moved to the subdirectories the slash after the directory name is left on as otherwise the names potentially become unanchored (without a leading slash, "foo" also matches "bar/foo").

As a final step these were either sorted or formatted to match existing file format.

---
Changes in v2:
- More information in commit message
- Rebased onto correct branch before submission

---
 .gitignore                   | 31 -------------------------------
 tools/misc/.gitignore        | 23 ++++++++++++++++++++++-
 xen/tools/kconfig/.gitignore |  6 ++++++
 xen/xsm/flask/.gitignore     |  9 ++++++++-
 4 files changed, 36 insertions(+), 33 deletions(-)
.gitignore +0 -31
index 36ce2ea104..429a484ecc 100644
@@ -204,21 +204,6 @@ tools/libxl/ssdt*
 tools/libxl/testenum
 tools/libxl/testenum.c
 tools/libxl/tmp.*
-tools/misc/cpuperf/cpuperf-perfcntr
-tools/misc/cpuperf/cpuperf-xen
-tools/misc/xc_shadow
-tools/misc/xen_cpuperf
-tools/misc/xen-cpuid
-tools/misc/xen-detect
-tools/misc/xen-diag
-tools/misc/xen-tmem-list-parse
-tools/misc/xen-livepatch
-tools/misc/xenperf
-tools/misc/xenpm
-tools/misc/xen-hvmctx
-tools/misc/xenlockprof
-tools/misc/lowmemd
-tools/misc/xencov
 tools/pkg-config/*
 tools/qemu-xen-build
 tools/xentrace/xenalyze
@@ -315,17 +300,7 @@ xen/include/xen/lib/x86/cpuid-autogen.h
 xen/test/livepatch/config.h
 xen/test/livepatch/expect_config.h
 xen/test/livepatch/*.livepatch
-xen/tools/kconfig/.tmp_gtkcheck
-xen/tools/kconfig/.tmp_qtcheck
 xen/tools/symbols
-xen/xsm/flask/flask-policy.S
-xen/xsm/flask/include/av_perm_to_string.h
-xen/xsm/flask/include/av_permissions.h
-xen/xsm/flask/include/class_to_string.h
-xen/xsm/flask/include/flask.h
-xen/xsm/flask/include/initial_sid_to_string.h
-xen/xsm/flask/policy.*
-xen/xsm/flask/xenpolicy-*
 tools/flask/policy/policy.conf
 tools/flask/policy/xenpolicy-*
 xen/xen
@@ -357,8 +332,6 @@ tools/include/xen-foreign/arm32.h
 tools/include/xen-foreign/arm64.h
 
 .git
-tools/misc/xen-hptool
-tools/misc/xen-mfndump
 tools/libs/toolcore/include/_*.h
 tools/libxc/_*.[ch]
 tools/libxl/_*.[ch]
@@ -370,10 +343,6 @@ tools/libxl/test_timedereg
 tools/libxl/test_fdderegrace
 tools/firmware/etherboot/eb-roms.h
 tools/firmware/etherboot/gpxe-git-snapshot.tar.gz
-tools/misc/xenhypfs
-tools/misc/xenwatchdogd
-tools/misc/xen-hvmcrash
-tools/misc/xen-lowmemd
 tools/libvchan/vchan-node[12]
 tools/libvchan/vchan-socket-proxy
 tools/ocaml/*/.ocamldep.make
tools/misc/.gitignore +22 -1
index c5fe2cfccd..f909ceccb1 100644
@@ -1 +1,22 @@
-xen-ucode
+/cpuperf/cpuperf-perfcntr
+/cpuperf/cpuperf-xen
+/lowmemd
+/xc_shadow
+/xen-cpuid
+/xen-detect
+/xen-diag
+/xen-hptool
+/xen-hvmcrash
+/xen-hvmctx
+/xen-livepatch
+/xen-lowmemd
+/xen-mfndump
+/xen-tmem-list-parse
+/xen-ucode
+/xen_cpuperf
+/xencov
+/xenhypfs
+/xenlockprof
+/xenperf
+/xenpm
+/xenwatchdogd
xen/tools/kconfig/.gitignore +6 -0
index 9638790613..e289215d27 100644
@@ -15,3 +15,9 @@ mconf
 nconf
 qconf
 gconf
+
+#
+# temporary build tool checking files
+#
+/.tmp_gtkcheck
+/.tmp_qtcheck
xen/xsm/flask/.gitignore +8 -1
index 024edbe0ba..f186747c51 100644
@@ -1 +1,8 @@
-/policy.c
+/flask-policy.S
+/include/av_perm_to_string.h
+/include/av_permissions.h
+/include/class_to_string.h
+/include/flask.h
+/include/initial_sid_to_string.h
+/policy.*
+/xenpolicy-*
Signature · 5 lines
-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         [email protected]  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
#1 lore raw
Quoted 16 lines · Elliott Mitchell
tools/misc/.gitignore +12 -1
@@ -1 +1,22 @@
-xen-ucode
+/cpuperf/cpuperf-perfcntr
+/cpuperf/cpuperf-xen
+/lowmemd
+/xc_shadow
+/xen-cpuid
+/xen-detect
+/xen-diag
+/xen-hptool
+/xen-hvmcrash
+/xen-hvmctx
+/xen-livepatch
+/xen-lowmemd

tools/misc/.gitignore line 22

Quoted 10 lines
tools/misc/.gitignore +10 -0
+/xen-mfndump
+/xen-tmem-list-parse
+/xen-ucode
+/xen_cpuperf
+/xencov
+/xenhypfs
+/xenlockprof
+/xenperf
+/xenpm
+/xenwatchdogd

The earlier discussion had left me with the impression that the ./ form would be slightly better to use to avoid puzzling the occasional reader. Did I overlook or mis-interpret anything? Did you come to the conclusion that / is better, but forgot to mention the "why" in at least the cover letter?

Jan

#2 lore raw
Quoted 25 lines · Jan Beulich
Quoted 24 lines · Elliott Mitchell
tools/misc/.gitignore +20 -1
@@ -1 +1,22 @@
-xen-ucode
+/cpuperf/cpuperf-perfcntr
+/cpuperf/cpuperf-xen
+/lowmemd
+/xc_shadow
+/xen-cpuid
+/xen-detect
+/xen-diag
+/xen-hptool
+/xen-hvmcrash
+/xen-hvmctx
+/xen-livepatch
+/xen-lowmemd
+/xen-mfndump
+/xen-tmem-list-parse
+/xen-ucode
+/xen_cpuperf
+/xencov
+/xenhypfs
+/xenlockprof
+/xenperf
Quoted 8 lines

tools/misc/.gitignore line 22

Quoted 2 lines
tools/misc/.gitignore +2 -0
+/xenpm
+/xenwatchdogd

The earlier discussion had left me with the impression that the ./ form would be slightly better to use to avoid puzzling the occasional reader. Did I overlook or mis-interpret anything? Did you come to the conclusion that / is better, but forgot to mention the "why" in at least the cover letter?

Some of Xen's documentation isn't that great, even though most of git's documentation is quite good a few pieces aren't so great. The information on how .gitignore files are treated is less than wonderful.

I had *thought* "./" would restrict to capturing files in the current directory, but after some testing and then some reading of the documentation (oh, git check-ignore is a thing). Then reading the documentation again. Then reading the documentation *again*. I found an initial "/" restricts a pattern to the current directory, but git doesn't handle "./".

Apparently a pattern with a slash *anywhere* besides the *end* (which includes the very start) will be treated as a full path relative to the current directory. As such "foo/bar" and "/foo/bar" are equivalent. Yet "foo" and "/foo" are *not* equivalent.

Meanwhile a slash at the end tells git to *only* match a directory.

Then you have "**" which will match zero or more directories.

Signature · 4 lines
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         [email protected]  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
#3 lore raw
Quoted 46 lines · Elliott Mitchell
Quoted 25 lines · Jan Beulich
Quoted 24 lines · Elliott Mitchell
tools/misc/.gitignore +20 -1
@@ -1 +1,22 @@
-xen-ucode
+/cpuperf/cpuperf-perfcntr
+/cpuperf/cpuperf-xen
+/lowmemd
+/xc_shadow
+/xen-cpuid
+/xen-detect
+/xen-diag
+/xen-hptool
+/xen-hvmcrash
+/xen-hvmctx
+/xen-livepatch
+/xen-lowmemd
+/xen-mfndump
+/xen-tmem-list-parse
+/xen-ucode
+/xen_cpuperf
+/xencov
+/xenhypfs
+/xenlockprof
+/xenperf
Quoted 8 lines

tools/misc/.gitignore line 22

Quoted 2 lines
tools/misc/.gitignore +2 -0
+/xenpm
+/xenwatchdogd

The earlier discussion had left me with the impression that the ./ form would be slightly better to use to avoid puzzling the occasional reader. Did I overlook or mis-interpret anything? Did you come to the conclusion that / is better, but forgot to mention the "why" in at least the cover letter?

Some of Xen's documentation isn't that great, even though most of git's documentation is quite good a few pieces aren't so great. The information on how .gitignore files are treated is less than wonderful.

I had *thought* "./" would restrict to capturing files in the current directory, but after some testing and then some reading of the documentation (oh, git check-ignore is a thing). Then reading the documentation again. Then reading the documentation *again*. I found an initial "/" restricts a pattern to the current directory, but git doesn't handle "./".

Quoted 4 lines

Apparently a pattern with a slash *anywhere* besides the *end* (which includes the very start) will be treated as a full path relative to the current directory. As such "foo/bar" and "/foo/bar" are equivalent. Yet "foo" and "/foo" are *not* equivalent.

But then ./foo and /foo ought to be equivalent, too. Unless of course the . gets in the way of matching names in the first place ...

Jan

#4 lore raw
Quoted 8 lines · Jan Beulich
Quoted 7 lines · Elliott Mitchell

I had *thought* "./" would restrict to capturing files in the current directory, but after some testing and then some reading of the documentation (oh, git check-ignore is a thing). Then reading the documentation again. Then reading the documentation *again*. I found an initial "/" restricts a pattern to the current directory, but git doesn't handle "./".

Quoted 8 lines
Quoted 4 lines

Apparently a pattern with a slash *anywhere* besides the *end* (which includes the very start) will be treated as a full path relative to the current directory. As such "foo/bar" and "/foo/bar" are equivalent. Yet "foo" and "/foo" are *not* equivalent.

But then ./foo and /foo ought to be equivalent, too. Unless of course the . gets in the way of matching names in the first place ...

Could be something along those lines. Note gitignore is a function of *git* *simulating* the actions involved in accessing files, not something pretending to be all that close to an actual kernel implementation.

The result is testing with git check-ignore indicated "./" did not work, so I had to use "/" which looks odd in a suspicions way. I rather liked "./", but with reality intruding.

Signature · 4 lines
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         [email protected]  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445