ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-29 00:59:39 +09:00
Code Issues Projects Releases Wiki Activity

feat(api): support ref suffixes in compare (#38148)

Browse Source 
Compare API requests with a `^` or `~N` revision suffix (for example
`compare/main...feature^`) were rejected with `400 Unsupported
comparison syntax: ref with suffix`. The fix resolves the suffix to a
commit before comparing, so `base...head^` and `~N` work on either side,
the same as git.

Only `^`/`~N` navigation is resolved. Pull request creation still
requires plain branch refs, and the web compare page keeps rejecting
suffixes since its branch selectors need separate UI work.

Closes #33943
This commit is contained in:
Eyüp Can Akman
2026-06-24 05:38:02 +00:00
committed by GitHub
parent 59d4825a95
commit ef927f9fa3
11 changed files with 246 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/api_repo_compare_test.go
+34
View File
@@ -45,6 +45,40 @@ func TestAPICompareBranches(t *testing.T) {
assert.Len(t, apiResp.Commits, 1)
})
t.Run("CompareWithRefSuffix", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
// remove-files-b^ is the parent of the tip, so the range drops the tip and ends at that parent
const parentSHA = "b67e43a07d48243a5f670ace063acd5e13f719df"
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv...remove-files-b^").AddTokenAuth(token2)
resp := MakeRequest(t, req, http.StatusOK)
apiResp := DecodeJSON(t, resp, &api.Compare{})
assert.Equal(t, 1, apiResp.TotalCommits)
assert.Len(t, apiResp.Commits, 1)
assert.Equal(t, parentSHA, apiResp.Commits[0].SHA)
// the same suffix on the direct ".." comparison resolves to the same commit
req = NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv..remove-files-b^").AddTokenAuth(token2)
resp = MakeRequest(t, req, http.StatusOK)
apiResp = DecodeJSON(t, resp, &api.Compare{})
assert.Equal(t, 1, apiResp.TotalCommits)
assert.Equal(t, parentSHA, apiResp.Commits[0].SHA)
req = NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv~1...add-csv").AddTokenAuth(token2)
resp = MakeRequest(t, req, http.StatusOK)
apiResp = DecodeJSON(t, resp, &api.Compare{})
assert.Equal(t, 1, apiResp.TotalCommits)
assert.Len(t, apiResp.Commits, 1)
// a valid but unresolvable suffix is not found, while an unsupported suffix (^{...}) is a bad request
req = NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv...remove-files-b~50").AddTokenAuth(token2)
MakeRequest(t, req, http.StatusNotFound)
req = NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv...remove-files-b^{/Add}").AddTokenAuth(token2)
MakeRequest(t, req, http.StatusBadRequest)
req = NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/add-csv^{/Add}...remove-files-b").AddTokenAuth(token2)
MakeRequest(t, req, http.StatusBadRequest)
})
t.Run("CompareForkOnlyCommit", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()