chore: cas fixes

denis256 · denis256 · commit e41fac0fe70a · 2025-12-08T18:21:21.000Z
diff --git a/internal/cas/cas.go b/internal/cas/cas.go
@@ -117,7 +117,7 @@ func (c *CAS) Clone(ctx context.Context, l log.Logger, opts *CloneOptions, url s
 
 		if c.store.NeedsWrite(hash) {
 			// Create a temporary directory for git operations
-			tempDir, cleanup, createTempDirErr := c.git.CreateTempDir()
+			_, cleanup, createTempDirErr := c.git.CreateTempDir()
 			if createTempDirErr != nil {
 				return createTempDirErr
 			}
@@ -128,8 +128,6 @@ func (c *CAS) Clone(ctx context.Context, l log.Logger, opts *CloneOptions, url s
 				}
 			}()
 
-			c.git.WithWorkDir(tempDir)
-
 			if cloneAndStoreErr := c.cloneAndStoreContent(childCtx, l, opts, url, hash); cloneAndStoreErr != nil {
 				return cloneAndStoreErr
 			}
diff --git a/internal/git/git.go b/internal/git/git.go
@@ -209,7 +209,7 @@ func (g *GitRunner) CreateTempDir() (string, func() error, error) {
 		}
 	}
 
-	g.WithWorkDir(tempDir)
+	g.WorkDir = tempDir
 
 	cleanup := func() error {
 		if err := os.RemoveAll(tempDir); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (c CAS) Clone(ctx context.Context, l log.Logger, opts CloneOptions, url s`
`117`	`117`
`118`	`118`	`if c.store.NeedsWrite(hash) {`
`119`	`119`	`// Create a temporary directory for git operations`
`120`		`- tempDir, cleanup, createTempDirErr := c.git.CreateTempDir()`
	`120`	`+ _, cleanup, createTempDirErr := c.git.CreateTempDir()`
`121`	`121`	`if createTempDirErr != nil {`
`122`	`122`	`return createTempDirErr`
`123`	`123`	`}`
`@@ -128,8 +128,6 @@ func (c CAS) Clone(ctx context.Context, l log.Logger, opts CloneOptions, url s`
`128`	`128`	`}`
`129`	`129`	`}()`
`130`	`130`
`131`		`- c.git.WithWorkDir(tempDir)`
`132`		`-`
`133`	`131`	`if cloneAndStoreErr := c.cloneAndStoreContent(childCtx, l, opts, url, hash); cloneAndStoreErr != nil {`
`134`	`132`	`return cloneAndStoreErr`
`135`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ func (g *GitRunner) CreateTempDir() (string, func() error, error) {`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`- g.WithWorkDir(tempDir)`
	`212`	`+ g.WorkDir = tempDir`
`213`	`213`
`214`	`214`	`cleanup := func() error {`
`215`	`215`	`if err := os.RemoveAll(tempDir); err != nil {`