Skip to content

Fix additional files being deleted prematurely #468

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 2 commits into from
Feb 16, 2021
Merged

Fix additional files being deleted prematurely #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8728f87
Fix additional files being deleted prematurely
eseliger Feb 16, 2021
b07b99b
Update CHANGELOG.md
mrnugget Feb 16, 2021
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ All notable changes to `src-cli` are documented in this file.

### Fixed

- Workspaces could sometimes fail with docker bind mount errors, due to a race condition of multiple workspaces accessing the same auxilliary files. [#468](https://github.com/sourcegraph/src-cli/pull/468)

### Removed

## 3.24.5
Expand Down
2 changes: 1 addition & 1 deletion internal/campaigns/repo_fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (rf *repoFetcher) zipFor(repo *graphql.Repository, workspacePath string) *r
for _, component := range pathComponents {
for _, name := range []string{".gitignore", ".gitattributes"} {
filename := path.Join(currentPath, name)
localPath := filepath.Join(rf.dir, repo.SlugForPath(filename))
localPath := filepath.Join(rf.dir, repo.SlugForPath(workspacePath+filename))

zip.additionalFiles = append(zip.additionalFiles, &additionalFile{
filename: filename,
Expand Down