Skip to content

Fix partial cloning a repo (#18373) #18377

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 8 commits into from
Jan 23, 2022
Merged

Fix partial cloning a repo (#18373) #18377

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66646a3
Fix partial cloning a repo (#18373)
Jan 23, 2022
368b34c
Include diff & use copy
Jan 23, 2022
fce7ea7
Add partial clone test
lunny Jan 23, 2022
027531c
patch
6543 Jan 23, 2022
09c1a2b
Apply suggestions from code review
6543 Jan 23, 2022
2acce70
globalArgs first
6543 Jan 23, 2022
1ef5b61
avoid copy but make GlobalCMDArgs append first
6543 Jan 23, 2022
3a6e242
please linter
6543 Jan 23, 2022
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
1 change: 1 addition & 0 deletions modules/git/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diff
cmd.Dir = repo.Path
cmd.Stdout = writer
cmd.Stderr = stderr
copy(cmd.Args, GlobalCommandArgs)

if err = cmd.Run(); err != nil {
return fmt.Errorf("Run: %v - %s", err, stderr)
Expand Down
5 changes: 5 additions & 0 deletions routers/web/repo/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,12 @@ func serviceRPC(h serviceHandler, service string) {
var stderr bytes.Buffer
cmd := exec.CommandContext(ctx, git.GitExecutable, service, "--stateless-rpc", h.dir)
cmd.Dir = h.dir

cmd.Env = append(os.Environ(), h.environ...)
cargs := make([]string, len(git.GlobalCommandArgs))
copy(cargs, git.GlobalCommandArgs)
cmd.Env = append(cmd.Env, cargs...)

cmd.Stdout = h.w
cmd.Stdin = reqBody
cmd.Stderr = &stderr
Expand Down