diff mbox series

[RFC] git: consolidate .gitignore files

Message ID 20250210172050.8884-1-stephen@networkplumber.org (mailing list archive)
State Accepted
Delegated to: Thomas Monjalon
Headers
Series [RFC] git: consolidate .gitignore files |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-marvell-Functional success Functional Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-sample-apps-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS

Commit Message

Stephen Hemminger Feb. 10, 2025, 5:20 p.m. UTC 
Lets have only one .gitignore at top level.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 .gitignore                   | 6 ++++++
 dts/.gitignore               | 4 ----
 kernel/linux/uapi/.gitignore | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 dts/.gitignore
 delete mode 100644 kernel/linux/uapi/.gitignore

Comments

Thomas Monjalon Feb. 11, 2025, 8:38 a.m. UTC | #1 
10/02/2025 18:20, Stephen Hemminger:
> +# ignore Linux UAPI kernel headers
> +kernel/linux/uapi/version
> +kernel/linux/uapi/**/*.h

The original .gitignore had some "!" for an opposite logic.
I think we can just completely drop this one, it looks unneeded.
Patrick Robb Feb. 11, 2025, 3:43 p.m. UTC | #2 
On Mon, Feb 10, 2025 at 12:21 PM Stephen Hemminger <
stephen@networkplumber.org> wrote:

>
> diff --git a/.gitignore b/.gitignore
> index 903fe9bc64..a1a6843494 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -43,6 +43,8 @@ TAGS
>
>  # DTS results
>  dts/output
> +dts/nodes.yaml
> +dts/test_rund.yaml
>

test_rund -> test_runs
Thomas Monjalon March 14, 2025, 11 a.m. UTC | #3 
10/02/2025 18:20, Stephen Hemminger:
> Lets have only one .gitignore at top level.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Applied with uAPI rules dropped and these explanations added:

"
Some generated DTS files must be ignored.

The Linux uAPI files should not be ignored.
"
Patrick Robb March 14, 2025, 3:18 p.m. UTC | #4 
https://git.dpdk.org/next/dpdk-next-dts/commit/?id=564f4abb42df0cdf7da8c53933705bc205642005

This commit on next-dts changes the name of this default config file from
test_runs.yaml to test_run.yaml. However, it is not pulled to main yet.

I can send a patch equivalent to Stephen's which changes test_rund.yml to
test_run.yaml. But, should it be applied to next-dts instead of main, so
that it is "on top of" commit 564f4abb42df0cdf7da8c53933705bc205642005
which necessitates it?
Thomas Monjalon March 14, 2025, 3:28 p.m. UTC | #5 
14/03/2025 16:18, Patrick Robb:
> https://git.dpdk.org/next/dpdk-next-dts/commit/?id=564f4abb42df0cdf7da8c53933705bc205642005
> 
> This commit on next-dts changes the name of this default config file from
> test_runs.yaml to test_run.yaml. However, it is not pulled to main yet.
> 
> I can send a patch equivalent to Stephen's which changes test_rund.yml to
> test_run.yaml. But, should it be applied to next-dts instead of main, so
> that it is "on top of" commit 564f4abb42df0cdf7da8c53933705bc205642005
> which necessitates it?

Please can you rebase next-dts on top of main?
It will force you to make the change in the root .gitconfig
Patrick Robb March 15, 2025, 9:25 p.m. UTC | #6 
On Fri, Mar 14, 2025 at 11:28 AM Thomas Monjalon <thomas@monjalon.net>
wrote:

>
> Please can you rebase next-dts on top of main?
> It will force you to make the change in the root .gitconfig
>

Thanks for the explanation this should be all set - I have rebased next-dts
and here is the updated commit:
https://git.dpdk.org/next/dpdk-next-dts/commit/?id=3528d203499dc4011ced10a314e06f2ace0a03f7

Paul I have a local backup of the old for-main if we need for any reason,
but it seems like a git edit on the commit above during the interactive
rebase is the correct way to fix this.
diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index 903fe9bc64..a1a6843494 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,8 @@  TAGS
 
 # DTS results
 dts/output
+dts/nodes.yaml
+dts/test_rund.yaml
 
 # ignore default build directory, and directories from test-meson-builds.sh
 build
@@ -50,3 +52,7 @@  build-*
 # ignore other build directory patterns
 *-gcc*
 *-clang*
+
+# ignore Linux UAPI kernel headers
+kernel/linux/uapi/version
+kernel/linux/uapi/**/*.h
diff --git a/dts/.gitignore b/dts/.gitignore
deleted file mode 100644
index d53a2f3b7e..0000000000
--- a/dts/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# default configuration files for DTS
-nodes.yaml
-test_runs.yaml
-
diff --git a/kernel/linux/uapi/.gitignore b/kernel/linux/uapi/.gitignore
deleted file mode 100644
index 558ba597d6..0000000000
--- a/kernel/linux/uapi/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@ 
-**
-!**/
-!**/*.h
-!version