Update retriever.go

liamg · web-flow · commit b3a869837d6c · 2021-03-29T07:39:18.000+01:00
diff --git a/internal/pkg/gitjacker/retriever.go b/internal/pkg/gitjacker/retriever.go
@@ -134,7 +134,8 @@ func (r *retriever) parsePackMetadata(meta []byte) error {
 	for _, line := range lines {
 		parts := strings.Split(strings.TrimSpace(line), " ")
 		if parts[0] == "P" && len(parts) == 2 {
-			if err := r.downloadFile(fmt.Sprintf("objects/pack/%s", parts[1])); err != nil {
+			packPath := filepath.Join(r.outputDir, ".git", "objects", "pack", filepath.FromSlash(filepath.Clean("/"+parts[1])))
+			if err := r.downloadFile(packPath)); err != nil {
 				logrus.Debugf("Failed to retrieve pack file %s: %s", parts[1], err)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ func (r *retriever) parsePackMetadata(meta []byte) error {`
`134`	`134`	`for _, line := range lines {`
`135`	`135`	`parts := strings.Split(strings.TrimSpace(line), " ")`
`136`	`136`	`if parts[0] == "P" && len(parts) == 2 {`
`137`		`- if err := r.downloadFile(fmt.Sprintf("objects/pack/%s", parts[1])); err != nil {`
	`137`	`+ packPath := filepath.Join(r.outputDir, ".git", "objects", "pack", filepath.FromSlash(filepath.Clean("/"+parts[1])))`
	`138`	`+ if err := r.downloadFile(packPath)); err != nil {`
`138`	`139`	`logrus.Debugf("Failed to retrieve pack file %s: %s", parts[1], err)`
`139`	`140`	`}`
`140`	`141`	`}`