From 96ed6c59ee58ecbe46f9e652467340b6e20a100d Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Mon, 3 Dec 2018 08:55:40 +0000 Subject: [PATCH 1/2] git: Sort .gitignore entries Sort the contents of `.gitignore` into two groups: globs and actual paths. This is more intuitive than a purely sorted list. Signed-off-by: James O. D. Hunt --- .gitignore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 58b1b58a2..8bb0acdae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,16 @@ -*.patch *.o +*.patch *.swp -/kata-runtime -/data/kata-collect-data.sh -/cli/coverage.html -/cli/config-generated.go /cli/config/configuration.toml +/cli/config-generated.go +/cli/coverage.html +/data/kata-collect-data.sh /kata-netmon +/kata-runtime /virtcontainers/hack/virtc/virtc /virtcontainers/hook/mock/hook -/virtcontainers/shim/mock/shim +/virtcontainers/profile.cov /virtcontainers/shim/mock/cc-shim/cc-shim /virtcontainers/shim/mock/kata-shim/kata-shim +/virtcontainers/shim/mock/shim /virtcontainers/utils/supportfiles -/virtcontainers/profile.cov From 7093eec9c42186e9316b6dec2fbbd0bfe04f9e5b Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Mon, 3 Dec 2018 08:57:46 +0000 Subject: [PATCH 2/2] git: Add containerd-shim-kata-v2 to .gitignore Hide the `containerd-shim-kata-v2` binary from `git status`. Fixes: #966. Signed-off-by: James O. D. Hunt --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8bb0acdae..007129979 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /cli/config/configuration.toml /cli/config-generated.go /cli/coverage.html +/containerd-shim-kata-v2 /data/kata-collect-data.sh /kata-netmon /kata-runtime