Git/gitea-tea
1
0 Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2026-10-26 19:11:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(repo): keep pushes from a cloned fork on the fork

Browse Source 
Cloning a fork pointed the default branch at the upstream remote, so a
plain `git push` targeted the parent repository. The branch still pulls
from upstream, which keeps tea targeting the parent, but now sets
branch.<default>.pushRemote=origin so pushes go to the fork.

Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
bircni committed 2026-10-11 21:44:44 +02:00
1 parent b3dc3f47cb
commit 59bae60926
2 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/app/clone_test.go
+3 -1
View File
@@ -100,6 +100,7 @@ func TestCloneAddsUpstreamRemoteForForks(t *testing.T) {
"remote add -- upstream " + parent: "", "remote add -- upstream " + parent: "",
"config branch.main.remote upstream": "", "config branch.main.remote upstream": "",
"config branch.main.merge refs/heads/main": "", "config branch.main.merge refs/heads/main": "",
"config branch.main.pushRemote origin": "",
}} }}
deps.Git = runner deps.Git = runner
cwd := t.TempDir() cwd := t.TempDir()
@@ -109,9 +110,10 @@ func TestCloneAddsUpstreamRemoteForForks(t *testing.T) {
"remote add -- upstream " + parent, "remote add -- upstream " + parent,
"config branch.main.remote upstream", "config branch.main.remote upstream",
"config branch.main.merge refs/heads/main", "config branch.main.merge refs/heads/main",
"config branch.main.pushRemote origin",
}, runner.calls) }, runner.calls)
clone := filepath.Join(cwd, "destination") clone := filepath.Join(cwd, "destination")
require.Equal(t, []string{cwd, clone, clone, clone}, runner.dirs) require.Equal(t, []string{cwd, clone, clone, clone, clone}, runner.dirs)
require.JSONEq(t, `{"id":8,"full_name":"bob/project","fork":true}`, out.String()) require.JSONEq(t, `{"id":8,"full_name":"bob/project","fork":true}`, out.String())
} }
internal/app/repo_mutations.go
+5 -5
View File
@@ -278,12 +278,12 @@ func (a *application) cloneRepository(cmd *cobra.Command, t target, item service
if _, err := a.gitIn(cmd.Context(), clone, "remote", "add", "--", "upstream", upstream); err != nil { if _, err := a.gitIn(cmd.Context(), clone, "remote", "add", "--", "upstream", upstream); err != nil {
return fmt.Errorf("cloned the fork, but could not add the upstream remote: %w", err) return fmt.Errorf("cloned the fork, but could not add the upstream remote: %w", err)
} }
// The default branch pulls from upstream, but pushes stay on the fork.
if branch := item.Parent.DefaultBranch; branch != "" { if branch := item.Parent.DefaultBranch; branch != "" {
if _, err := a.gitIn(cmd.Context(), clone, "config", "branch."+branch+".remote", "upstream"); err != nil { for _, setting := range [][2]string{{"remote", "upstream"}, {"merge", "refs/heads/" + branch}, {"pushRemote", "origin"}} {
return fmt.Errorf("cloned the fork and added upstream, but could not configure branch tracking: %w", err) if _, err := a.gitIn(cmd.Context(), clone, "config", "branch."+branch+"."+setting[0], setting[1]); err != nil {
} return fmt.Errorf("cloned the fork and added upstream, but could not configure branch tracking: %w", err)
if _, err := a.gitIn(cmd.Context(), clone, "config", "branch."+branch+".merge", "refs/heads/"+branch); err != nil { }
return fmt.Errorf("cloned the fork and added upstream, but could not configure branch tracking: %w", err)
} }
} }
} }