fix merge conflicts. (#497)

trufflesecurity · May 2, 2022 · 1bd5e9d · 1bd5e9d
1 parent eb9d3e3
commit 1bd5e9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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 = true
 		switch {

diff --git 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,