From a41218551da19b4fb987c5090665692d24852d03 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Mon, 24 Apr 2023 12:43:45 +0200 Subject: [PATCH] Put gitCommon.version back in deps_test.go This was reverted in 3546ab8f21, but shouldn't have. --- pkg/commands/git_commands/deps_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/commands/git_commands/deps_test.go b/pkg/commands/git_commands/deps_test.go index df2c96253..bcf36b168 100644 --- a/pkg/commands/git_commands/deps_test.go +++ b/pkg/commands/git_commands/deps_test.go @@ -15,6 +15,7 @@ import ( type commonDeps struct { runner *oscommands.FakeCmdObjRunner userConfig *config.UserConfig + gitVersion *GitVersion gitConfig *git_config.FakeGitConfig getenv func(string) string removeFile func(string) error @@ -48,6 +49,11 @@ func buildGitCommon(deps commonDeps) *GitCommon { gitCommon.Common.UserConfig = config.GetDefaultConfig() } + gitCommon.version = deps.gitVersion + if gitCommon.version == nil { + gitCommon.version = &GitVersion{2, 0, 0, ""} + } + gitConfig := deps.gitConfig if gitConfig == nil { gitConfig = git_config.NewFakeGitConfig(nil)