diff --git a/cli/command/image/build/internal/git/gitutils.go b/cli/command/image/build/internal/git/gitutils.go
index 4270e86ef5..d23ebe3375 100644
--- a/cli/command/image/build/internal/git/gitutils.go
+++ b/cli/command/image/build/internal/git/gitutils.go
@@ -46,7 +46,7 @@ func Clone(remoteURL string, opts ...CloneOption) (string, error) {
 	return repo.clone()
 }
 
-func (repo gitRepo) clone() (checkoutDir string, err error) {
+func (repo gitRepo) clone() (checkoutDir string, retErr error) {
 	fetch := fetchArgs(repo.remote, repo.ref)
 
 	root, err := os.MkdirTemp("", "docker-build-git")
@@ -55,8 +55,8 @@ func (repo gitRepo) clone() (checkoutDir string, err error) {
 	}
 
 	defer func() {
-		if err != nil {
-			os.RemoveAll(root)
+		if retErr != nil {
+			_ = os.RemoveAll(root)
 		}
 	}()