Skip to content

Fix clean tmp dir #32360

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

Merged
merged 5 commits into from
Oct 29, 2024
Merged

Fix clean tmp dir #32360

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3b9833
Fix clean tmp dir
lunny Oct 28, 2024
812f8bb
Make code more clear
lunny Oct 29, 2024
2b730a1
fix cancel
wxiaoguang Oct 29, 2024
8909b75
Merge branch 'main' into lunny/clean_tmp_dir
6543 Oct 29, 2024
41cbab5
Merge branch 'main' into lunny/clean_tmp_dir
GiteaBot Oct 29, 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
24 changes: 17 additions & 7 deletions modules/git/repo_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,31 @@ 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 {
cancel()
}
}()

tmpDir, err = os.MkdirTemp("", "index")
if err != nil {
return filename, tmpDir, cancel, 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)
if err != nil {
defer cancel()
return "", "", func() {}, err
}
return filename, tmpDir, cancel, err
Expand Down
Loading