Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
fix merge conflicts. (#497)
ahrav1bd5e9d9d23c
diff --git a/pkg/sources/git/git.go b/pkg/sources/git/git.goindex 08bc49215..5efcaa595 100644--- a/pkg/sources/git/git.go+++ b/pkg/sources/git/git.go@@ -484,7 +484,7 @@ func PrepareRepo(uriString string) (string, bool, error) {switch uri.Scheme {case "file":path = fmt.Sprintf("%s%s", uri.Host, uri.Path)- case "https":+ case "http", "https":remotePath := fmt.Sprintf("%s://%s%s", uri.Scheme, uri.Host, uri.Path)remote = trueswitch {diff --git a/pkg/sources/git/git_test.go b/pkg/sources/git/git_test.goindex 61646bee8..212109db6 100644--- a/pkg/sources/git/git_test.go+++ b/pkg/sources/git/git_test.go@@ -420,6 +420,12 @@ func TestPrepareRepo(t *testing.T) {remote: true,err: nil,},+ {+ uri: "http://github.com/dustin-decker/secretsandstuff.git",+ path: true,+ remote: true,+ err: nil,+ },{uri: "file:///path/to/file.json",path: true,