| Message ID | e4ba4f716599d1d66c8bc60489f4b05764ea8470.1582812034.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f3a60268f5cec7dae0e9713f5fc65aecc3734c09 |
| Headers | show |
| Series | selftest/lkdtm: Use local .gitignore | expand |
On Thu, Feb 27, 2020 at 02:07:10PM +0000, Christophe Leroy wrote: > Commit 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") > introduced patterns for git to ignore files generated in > tools/testing/selftests/lkdtm/ > > Use local .gitignore file instead of using the root one. > > Fixes: 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Yeah, that's better. Thanks! Acked-by: Kees Cook <keescook@chromium.org> -Kees > --- > .gitignore | 4 ---- > tools/testing/selftests/lkdtm/.gitignore | 2 ++ > 2 files changed, 2 insertions(+), 4 deletions(-) > create mode 100644 tools/testing/selftests/lkdtm/.gitignore > > diff --git a/.gitignore b/.gitignore > index bb05dce58f8e..b849a72d69d5 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -100,10 +100,6 @@ modules.order > /include/ksym/ > /arch/*/include/generated/ > > -# Generated lkdtm tests > -/tools/testing/selftests/lkdtm/*.sh > -!/tools/testing/selftests/lkdtm/run.sh > - > # stgit generated dirs > patches-* > > diff --git a/tools/testing/selftests/lkdtm/.gitignore b/tools/testing/selftests/lkdtm/.gitignore > new file mode 100644 > index 000000000000..f26212605b6b > --- /dev/null > +++ b/tools/testing/selftests/lkdtm/.gitignore > @@ -0,0 +1,2 @@ > +*.sh > +!run.sh > -- > 2.25.0 >
On 2/27/20 9:17 AM, Kees Cook wrote: > On Thu, Feb 27, 2020 at 02:07:10PM +0000, Christophe Leroy wrote: >> Commit 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") >> introduced patterns for git to ignore files generated in >> tools/testing/selftests/lkdtm/ >> >> Use local .gitignore file instead of using the root one. >> >> Fixes: 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") >> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > > Yeah, that's better. Thanks! > > Acked-by: Kees Cook <keescook@chromium.org> > I will apply it for next rc. Thanks. I should have noticed the problem in the previous version. It slipped by me. :( thanks, -- Shuah
Le 27/02/2020 à 17:45, Shuah Khan a écrit : > On 2/27/20 9:17 AM, Kees Cook wrote: >> On Thu, Feb 27, 2020 at 02:07:10PM +0000, Christophe Leroy wrote: >>> Commit 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") >>> introduced patterns for git to ignore files generated in >>> tools/testing/selftests/lkdtm/ >>> >>> Use local .gitignore file instead of using the root one. >>> >>> Fixes: 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") >>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> >> >> Yeah, that's better. Thanks! >> >> Acked-by: Kees Cook <keescook@chromium.org> >> > > I will apply it for next rc. > > Thanks. I should have noticed the problem in the previous version. > It slipped by me. :( > My fault, I didn't even know we could have .gitignore in subdirectories. Christophe
diff --git a/.gitignore b/.gitignore index bb05dce58f8e..b849a72d69d5 100644 --- a/.gitignore +++ b/.gitignore @@ -100,10 +100,6 @@ modules.order /include/ksym/ /arch/*/include/generated/ -# Generated lkdtm tests -/tools/testing/selftests/lkdtm/*.sh -!/tools/testing/selftests/lkdtm/run.sh - # stgit generated dirs patches-* diff --git a/tools/testing/selftests/lkdtm/.gitignore b/tools/testing/selftests/lkdtm/.gitignore new file mode 100644 index 000000000000..f26212605b6b --- /dev/null +++ b/tools/testing/selftests/lkdtm/.gitignore @@ -0,0 +1,2 @@ +*.sh +!run.sh
Commit 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") introduced patterns for git to ignore files generated in tools/testing/selftests/lkdtm/ Use local .gitignore file instead of using the root one. Fixes: 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- .gitignore | 4 ---- tools/testing/selftests/lkdtm/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/lkdtm/.gitignore