Update repo_index.go

Author: wxiaoguang

modules/git/repo_index.go

@@ -51,18 +51,9 @@ func (repo *Repository) readTreeToIndex(id ObjectID, indexFilename ...string) er
 
 // ReadTreeToTemporaryIndex reads a treeish to a temporary index file
 func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename, tmpDir string, cancel context.CancelFunc, err error) {
-	cancel = func() {
-		if tmpDir == "" {
-			return
-		}
-		if removeErr := util.RemoveAll(tmpDir); removeErr != nil {
-			log.Error("failed to remove tmp index file: %v", removeErr)
-		}
-	}
-
-	// Defer the cancel function to ensure cleanup in case of an error
 	defer func() {
-		if err != nil {
+		// if error happens and there is a cancel function, do the clean up
+		if err != nil && cancel != nil {
 			cancel()
 		}
 	}()
@@ -73,6 +64,12 @@ func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename, tmpD
 	}
 
 	filename = filepath.Join(tmpDir, ".tmp-index")
+	cancel = func() {
+		err := util.RemoveAll(tmpDir)
+		if err != nil {
+			log.Error("failed to remove tmp index file: %v", err)
+		}
+	}
 
 	err = repo.ReadTreeToIndex(treeish, filename)
 	if err != nil {