Skip to contentSkip to conversation

perf tools: exclude the include/perf/ directory

PATCH Superseded Donglin Peng 2 participants 3 messages Nov 3, 2022 perf events

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf tools: exclude the include/perf/ directory

Commit 3af1dfdd51e0 ("perf build: Move perf_dlfilters.h in the source tree") moved perf_dlfilters.h to the include/perf/ directory without updating the .gitignore file, causing new files in the include/perf/ directory will be ignored.

Add !include/perf/ to perf's .gitignore file.

---
 tools/perf/.gitignore | 1 +
 1 file changed, 1 insertion(+)
tools/perf/.gitignore +1 -0
index a653311d9693..fd7a6ff9e7aa 100644
@@ -4,6 +4,7 @@ PERF-GUI-VARS
 PERF-VERSION-FILE
 FEATURE-DUMP
 perf
+!include/perf/
 perf-read-vdso32
 perf-read-vdsox32
 perf-help
Signature · 1 line
2.25.1
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Donglin Peng

Commit 3af1dfdd51e0 ("perf build: Move perf_dlfilters.h in the source tree") moved perf_dlfilters.h to the include/perf/ directory without updating the .gitignore file, causing new files in the include/perf/ directory will be ignored.

Note:

include/perf is ignored because it has 'perf' in the name

Can check:

Before:

 $ touch tools/perf/include/perf/junk
 $ git status | grep junk
 $ git check-ignore -v tools/perf/include/perf/junk
 tools/perf/.gitignore:6:perf    tools/perf/include/perf/junk

After:

 $ git status | grep junk
         tools/perf/include/perf/junk
 $ git check-ignore -v tools/perf/include/perf/junk
Quoted 4 lines

Add !include/perf/ to perf's .gitignore file.

Quoted 16 lines
---
 tools/perf/.gitignore | 1 +
 1 file changed, 1 insertion(+)
tools/perf/.gitignore +1 -0
index a653311d9693..fd7a6ff9e7aa 100644
@@ -4,6 +4,7 @@ PERF-GUI-VARS
 PERF-VERSION-FILE
 FEATURE-DUMP
 perf
+!include/perf/
 perf-read-vdso32
 perf-read-vdsox32
 perf-help
#2 lore raw
Quoted 11 lines · Adrian Hunter
Quoted 4 lines · Donglin Peng

Commit 3af1dfdd51e0 ("perf build: Move perf_dlfilters.h in the source tree") moved perf_dlfilters.h to the include/perf/ directory without updating the .gitignore file, causing new files in the include/perf/ directory will be ignored.

Note:

include/perf is ignored because it has 'perf' in the name

Right.

Quoted 8 lines

Can check:

Before:

 $ touch tools/perf/include/perf/junk
 $ git status | grep junk
 $ git check-ignore -v tools/perf/include/perf/junk
 tools/perf/.gitignore:6:perf    tools/perf/include/perf/junk
Quoted 5 lines

After:

 $ git status | grep junk
         tools/perf/include/perf/junk
 $ git check-ignore -v tools/perf/include/perf/junk

Thanks,I will modify the commit log and send a v2.

Quoted 24 lines
Quoted 4 lines

Add !include/perf/ to perf's .gitignore file.

Quoted 16 lines
---
 tools/perf/.gitignore | 1 +
 1 file changed, 1 insertion(+)
tools/perf/.gitignore +1 -0
index a653311d9693..fd7a6ff9e7aa 100644
@@ -4,6 +4,7 @@ PERF-GUI-VARS
 PERF-VERSION-FILE
 FEATURE-DUMP
 perf
+!include/perf/
 perf-read-vdso32
 perf-read-vdsox32
 perf-help