Merge pull request #641 from fluxcd/fix-dpanic-log

hiddeco · web-flow · commit be151c2fc112 · 2022-03-25T14:41:49.000+01:00
diff --git a/pkg/git/libgit2/checkout.go b/pkg/git/libgit2/checkout.go
@@ -38,7 +38,7 @@ import (
 // git.CheckoutOptions.
 func CheckoutStrategyForOptions(ctx context.Context, opt git.CheckoutOptions) git.CheckoutStrategy {
 	if opt.RecurseSubmodules {
-		logr.FromContextOrDiscard(ctx).Info("git submodule recursion not supported by '%s'", Implementation)
+		logr.FromContextOrDiscard(ctx).Info(fmt.Sprintf("git submodule recursion not supported by implementation '%s'", Implementation))
 	}
 	switch {
 	case opt.Commit != "":

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ import (`
`38`	`38`	`// git.CheckoutOptions.`
`39`	`39`	`func CheckoutStrategyForOptions(ctx context.Context, opt git.CheckoutOptions) git.CheckoutStrategy {`
`40`	`40`	`if opt.RecurseSubmodules {`
`41`		`- logr.FromContextOrDiscard(ctx).Info("git submodule recursion not supported by '%s'", Implementation)`
	`41`	`+ logr.FromContextOrDiscard(ctx).Info(fmt.Sprintf("git submodule recursion not supported by implementation '%s'", Implementation))`
`42`	`42`	`}`
`43`	`43`	`switch {`
`44`	`44`	`case opt.Commit != "":`