Fix bug

Author: lunny

services/pull/pull.go

@@ -597,7 +597,8 @@ func UpdatePullRequestGithubFlowHead(ctx context.Context, pr *issues_model.PullR
 
 	_, _, err := git.NewCommand("fetch", "--no-tags", "--refmap=").
 		AddDynamicArguments(pr.HeadRepo.RepoPath()).
-		AddDynamicArguments(fmt.Sprintf("refs/heads/%s:%s", pr.HeadBranch, pr.GetGitHeadRefName())).
+		// + means force fetch
+		AddDynamicArguments(fmt.Sprintf("+refs/heads/%s:%s", pr.HeadBranch, pr.GetGitHeadRefName())).
 		RunStdString(ctx, &git.RunOpts{Dir: pr.BaseRepo.RepoPath()})
 	return err
 }

tests/integration/pull_update_test.go

@@ -71,6 +71,9 @@ func TestAPIPullUpdateByRebase(t *testing.T) {
 			AddTokenAuth(token)
 		session.MakeRequest(t, req, http.StatusOK)
 
+		// reload pr
+		pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
+
 		// Test GetDiverging after update
 		diffCount, err = pull_service.GetDiverging(t.Context(), pr)
 		assert.NoError(t, err)