Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clean tmp dir (#32360) #32593

Merged
merged 3 commits into from
Nov 22, 2024
Merged

Fix clean tmp dir (#32360) #32593

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a3e7a3
Fix clean tmp dir (#32360)
lunny Oct 29, 2024
c03e6bc
Merge branch 'release/v1.22' into lunny/backport_32360
GiteaBot Nov 22, 2024
0c6b44f
Merge branch 'release/v1.22' into lunny/backport_32360
GiteaBot Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions modules/git/repo_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,35 @@ 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) {
func (repo *Repository) ReadTreeToTemporaryIndex(treeish string) (tmpIndexFilename, tmpDir string, cancel context.CancelFunc, err error) {
defer func() {
// if error happens and there is a cancel function, do clean up
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)
}
}
}

tmpDir, err = os.MkdirTemp("", "index")
if err != nil {
return filename, tmpDir, cancel, err
return "", "", nil, err
}

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)
tmpIndexFilename = filepath.Join(tmpDir, ".tmp-index")
cancel = removeDirFn(tmpDir)
err = repo.ReadTreeToIndex(treeish, tmpIndexFilename)
if err != nil {
defer cancel()
return "", "", func() {}, err
return "", "", cancel, err
}
return filename, tmpDir, cancel, err
return tmpIndexFilename, tmpDir, cancel, err
}

// EmptyIndex empties the index
Expand Down