From 1b2f701aa9a17abb7e27c7c1170d26398febf247 Mon Sep 17 00:00:00 2001 From: Liz Prucka Date: Thu, 2 Feb 2023 12:25:29 -0600 Subject: pkg/vcs: git clean submodules When changing branches, we were receiving an error that submodules were not clean. Added recurse-submodules flag in git reset to recursively reset submodules. Additionally, added command to recursively clean each subdirectory. --- pkg/vcs/git.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkg/vcs') diff --git a/pkg/vcs/git.go b/pkg/vcs/git.go index f6f6ee276..4872e88cf 100644 --- a/pkg/vcs/git.go +++ b/pkg/vcs/git.go @@ -176,10 +176,11 @@ func (git *git) reset() error { if git.precious { return nil } - git.git("reset", "--hard") + git.git("reset", "--hard", "--recurse-submodules") git.git("clean", "-fdx") + git.git("submodule", "foreach", "--recursive", "git", "clean", "-fdx") git.git("bisect", "reset") - _, err := git.git("reset", "--hard") + _, err := git.git("reset", "--hard", "--recurse-submodules") return err } -- cgit mrf-deployment