| Message ID | 20231026210015.17802-1-semen.protsenko@linaro.org |
|---|---|
| State | Accepted |
| Commit | aff5dddd42ae1998f40fc3b1d27858d3a1feafe0 |
| Headers | show |
| Series | tools: gitignore: Fix tools/generated path | expand |
On Thu, Oct 26, 2023 at 04:00:15PM -0500, Sam Protsenko wrote: > 'git status' shows 'tools/generated/' after running the build, which is > wrong. The corresponding .gitignore rule was already added in commit > c623642d29be ("Adjust gitignore for tools/generated/"), but because of > superfluous 'tools/' part it wasn't in effect. Remove incorrect 'tools/' > part to fix it. > > While at it, remove tools/ path incorrectly added to the top-level > .gitignore in commit 801c482207c7 (".gitignore: ignore misc include, > simple-bin, and tools/generated build artifacts"), as it's required in > the comment on the top of .gitignore: > > # NOTE! Don't add files that are generated in specific > # subdirectories here. Add them in the ".gitignore" file > # in that subdirectory instead. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > Fixes: c623642d29be ("Adjust gitignore for tools/generated/") > Fixes: 801c482207c7 (".gitignore: ignore misc include, simple-bin, and tools/generated build artifacts") Applied to u-boot/master, thanks!
diff --git a/.gitignore b/.gitignore index a1a79e92feef..330148119264 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ fit-dtb.blob* # Generated files # /spl/ -/tools/generated/ /tpl/ /defconfig diff --git a/tools/.gitignore b/tools/.gitignore index 941d38de212d..0108c567309b 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -34,7 +34,7 @@ /relocate-rela /spl_size_limit /sunxi-spl-image-builder -/tools/generated/**/*.c +/generated/**/*.c /update_octeon_header /version.h /xway-swap-bytes
'git status' shows 'tools/generated/' after running the build, which is wrong. The corresponding .gitignore rule was already added in commit c623642d29be ("Adjust gitignore for tools/generated/"), but because of superfluous 'tools/' part it wasn't in effect. Remove incorrect 'tools/' part to fix it. While at it, remove tools/ path incorrectly added to the top-level .gitignore in commit 801c482207c7 (".gitignore: ignore misc include, simple-bin, and tools/generated build artifacts"), as it's required in the comment on the top of .gitignore: # NOTE! Don't add files that are generated in specific # subdirectories here. Add them in the ".gitignore" file # in that subdirectory instead. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Fixes: c623642d29be ("Adjust gitignore for tools/generated/") Fixes: 801c482207c7 (".gitignore: ignore misc include, simple-bin, and tools/generated build artifacts") --- .gitignore | 1 - tools/.gitignore | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)