MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:27:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix clean tmp dir (#32360) (#32593)

Browse Source 
Backport #32360 

Try to fix #31792 

Credit to @jeroenlaylo
Copied from
https://github.com/go-gitea/gitea/issues/31792#issuecomment-2311920520

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Lunny Xiao 2024-11-22 00:50:35 -08:00 committed by GitHub
parent 2b8b2772fd
commit 073ba977fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/git/repo_index.go
View File

@ -50,25 +50,35 @@ func (repo *Repository) readTreeToIndex(id ObjectID, indexFilename ...string) er
} }
// ReadTreeToTemporaryIndex reads a treeish to a temporary index file // ReadTreeToTemporaryIndex reads a treeish to a temporary index file
func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (filename, tmpDir string, cancel context.CancelFunc, err error) { func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (tmpIndexFilename, tmpDir string, cancel context.CancelFunc, err error) {
tmpDir, err = os.MkdirTemp("", "index") defer func() {
if err != nil { // if error happens and there is a cancel function, do clean up
return filename, tmpDir, cancel, err if err != nil && cancel != nil {
} cancel()
cancel = nil
}
}()
filename = filepath.Join(tmpDir, ".tmp-index") removeDirFn := func(dir string) func() { // it can't use the return value "tmpDir" directly because it is empty when error occurs
cancel = func() { return func() {
err := util.RemoveAll(tmpDir) if err := util.RemoveAll(dir); err != nil {
if err != nil { log.Error("failed to remove tmp index dir: %v", err)
log.Error("failed to remove tmp index file: %v", err) }
} }
} }
err = repo.ReadTreeToIndex(treeish, filename)
tmpDir, err = os.MkdirTemp("", "index")
if err != nil { if err != nil {
defer cancel() return "", "", nil, err
return "", "", func() {}, err
} }
return filename, tmpDir, cancel, err
tmpIndexFilename = filepath.Join(tmpDir, ".tmp-index")
cancel = removeDirFn(tmpDir)
err = repo.ReadTreeToIndex(treeish, tmpIndexFilename)
if err != nil {
return "", "", cancel, err
}
return tmpIndexFilename, tmpDir, cancel, err
} }
// EmptyIndex empties the index // EmptyIndex empties the index