Mirrors/trufflehog
2
0
Fork 0
mirror of https://github.com/trufflesecurity/trufflehog.git synced 2024-11-10 15:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts. (#497)

Browse source
This commit is contained in:
ahrav 2022-05-02 22:04:05 +00:00 committed by GitHub
parent eb9d3e333c
commit 1bd5e9d9d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/sources/git/git.go
View file

@ -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 = true
switch {

6
pkg/sources/git/git_test.go
View file

@ -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,