diff options
| author | Liz Prucka <lizprucka@google.com> | 2023-02-02 12:25:29 -0600 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2023-02-03 11:24:54 +0100 |
| commit | 1b2f701aa9a17abb7e27c7c1170d26398febf247 (patch) | |
| tree | 894a77fc5b319cd79b17ecc07306ffdba142d096 /pkg/vcs | |
| parent | 64e439a66cef0360b60cb6d3fcd65395ebc28375 (diff) | |
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.
Diffstat (limited to 'pkg/vcs')
| -rw-r--r-- | pkg/vcs/git.go | 5 |
1 files changed, 3 insertions, 2 deletions
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 } |