Fix clean tmp dir

lunny · lunny · commit d3b98337353a · 2024-10-28T11:03:12.000-07:00
diff --git a/modules/git/repo_index.go b/modules/git/repo_index.go
@@ -63,9 +63,16 @@ func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename, tmpD
 			log.Error("failed to remove tmp index file: %v", err)
 		}
 	}
+
+	// Defer the cancel function to ensure cleanup in case of an error
+	defer func() {
+		if err != nil {
+			cancel()
+		}
+	}()
+
 	err = repo.ReadTreeToIndex(treeish, filename)
 	if err != nil {
-		defer cancel()
 		return "", "", func() {}, err
 	}
 	return filename, tmpDir, cancel, err

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,16 @@ func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename, tmpD`
`63`	`63`	`log.Error("failed to remove tmp index file: %v", err)`
`64`	`64`	`}`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ // Defer the cancel function to ensure cleanup in case of an error`
	`68`	`+ defer func() {`
	`69`	`+ if err != nil {`
	`70`	`+ cancel()`
	`71`	`+ }`
	`72`	`+ }()`
	`73`	`+`
`66`	`74`	`err = repo.ReadTreeToIndex(treeish, filename)`
`67`	`75`	`if err != nil {`
`68`		`- defer cancel()`
`69`	`76`	`return "", "", func() {}, err`
`70`	`77`	`}`
`71`	`78`	`return filename, tmpDir, cancel, err`