2022-11-03 04:29:58

by Donglin Peng

Subject: [PATCH] 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.

Signed-off-by: Donglin Peng <[email protected]>
---
tools/perf/.gitignore | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore
index a653311d9693..fd7a6ff9e7aa 100644
--- a/tools/perf/.gitignore
+++ b/tools/perf/.gitignore
@@ -4,6 +4,7 @@ PERF-GUI-VARS
PERF-VERSION-FILE
FEATURE-DUMP
perf
+!include/perf/
perf-read-vdso32
perf-read-vdsox32
perf-help
--
2.25.1

2022-11-03 07:54:44

by Adrian Hunter

Subject: Re: [PATCH] perf tools: exclude the include/perf/ directory

On 3/11/22 06:03, Donglin Peng wrote:
> 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

>
> Add !include/perf/ to perf's .gitignore file.
>
> Signed-off-by: Donglin Peng <[email protected]>

Acked-by: Adrian Hunter <[email protected]>

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

2022-11-03 08:12:52

by Donglin Peng

Subject: Re: [PATCH] perf tools: exclude the include/perf/ directory

On Thu, Nov 3, 2022 at 3:08 PM Adrian Hunter <[email protected]> wrote:
>
> On 3/11/22 06:03, Donglin Peng wrote:
> > 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.
> 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
>
Thanks,I will modify the commit log and send a v2.
> >
> > Add !include/perf/ to perf's .gitignore file.
> >
> > Signed-off-by: Donglin Peng <[email protected]>
>
> Acked-by: Adrian Hunter <[email protected]>
>
> > ---
> > tools/perf/.gitignore | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore
> > index a653311d9693..fd7a6ff9e7aa 100644
> > --- a/tools/perf/.gitignore
> > +++ b/tools/perf/.gitignore
> > @@ -4,6 +4,7 @@ PERF-GUI-VARS
> > PERF-VERSION-FILE
> > FEATURE-DUMP
> > perf
> > +!include/perf/
> > perf-read-vdso32
> > perf-read-vdsox32
> > perf-help
>