From 513da407f406b161aca078c8e1158f3394e71ca1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 7 Dec 2024 05:10:35 +0800 Subject: Support "merge upstream branch" (Sync fork) (#32741) Add basic "sync fork" support (GitHub-like)
![image](https://github.com/user-attachments/assets/e71473f4-4518-48c7-b9e2-fedfcd564fc3)
--- modules/git/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/git/repo.go b/modules/git/repo.go index 1c223018ad..fc6e6e7acc 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -223,7 +223,7 @@ func Push(ctx context.Context, repoPath string, opts PushOptions) error { if err != nil { if strings.Contains(stderr, "non-fast-forward") { return &ErrPushOutOfDate{StdOut: stdout, StdErr: stderr, Err: err} - } else if strings.Contains(stderr, "! [remote rejected]") { + } else if strings.Contains(stderr, "! [remote rejected]") || strings.Contains(stderr, "! [rejected]") { err := &ErrPushRejected{StdOut: stdout, StdErr: stderr, Err: err} err.GenerateMessage() return err -- cgit v1.2.3