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

Jump to bottom

Fix archive creating LFS hooks and breaking pull requests (#28848) #28851

Merged
merged 3 commits into from
Jan 21, 2024
Merged

Fix archive creating LFS hooks and breaking pull requests (#28848) #28851

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00fdb48
Fix archive creating LFS hooks and breaking pull requests (#28848)
brechtvl Jan 19, 2024
2dae5db
Merge branch 'release/v1.21' into backport-28848-v1.21
KN4CK3R Jan 19, 2024
b1729d7
Merge branch 'release/v1.21' into backport-28848-v1.21
GiteaBot Jan 21, 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
5 changes: 5 additions & 0 deletions modules/git/repo_archive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"context"
"fmt"
"io"
"os"
"path/filepath"
"strings"
)
Expand Down Expand Up @@ -62,11 +63,15 @@ func (repo *Repository) CreateArchive(ctx context.Context, format ArchiveType, t
cmd.AddOptionFormat("--format=%s", format.String())
cmd.AddDynamicArguments(commitID)

// Avoid LFS hooks getting installed because of /etc/gitconfig, which can break pull requests.
env := append(os.Environ(), "GIT_CONFIG_NOSYSTEM=1")

var stderr strings.Builder
err := cmd.Run(&RunOpts{
Dir: repo.Path,
Stdout: target,
Stderr: &stderr,
Env: env,
})
if err != nil {
return ConcatenateError(err, stderr.String())
Expand Down