aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
Code

Merge branch 'main' into add-priority-to-ProtectedBranch

Browse Source
This commit is contained in:
6543 2024-10-29 17:40:19 +01:00 committed by GitHub
commit 7588f5442b
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

36
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
}
}()
removeDirFn := func(dir string) func() { // it can't use the return value "tmpDir" directly because it is empty when error occurs
return func() {
if err := util.RemoveAll(dir); err != nil {
log.Error("failed to remove tmp index dir: %v", err)
}
}
} }
filename = filepath.Join(tmpDir, ".tmp-index") tmpDir, err = os.MkdirTemp("", "index")
cancel = func() {
err := util.RemoveAll(tmpDir)
if err != nil { if err != nil {
log.Error("failed to remove tmp index file: %v", err) return "", "", nil, err
} }
}
err = repo.ReadTreeToIndex(treeish, filename) tmpIndexFilename = filepath.Join(tmpDir, ".tmp-index")
cancel = removeDirFn(tmpDir)
err = repo.ReadTreeToIndex(treeish, tmpIndexFilename)
if err != nil { if err != nil {
defer cancel() return "", "", cancel, err
return "", "", func() {}, err
} }
return filename, tmpDir, cancel, err return tmpIndexFilename, tmpDir, cancel, err
} }
// EmptyIndex empties the index // EmptyIndex empties the index