From 9414930b5df4a176ad5f1dd3da1e7ffc8be44382 Mon Sep 17 00:00:00 2001 From: Dalius Dobravolskas Date: Tue, 19 Nov 2024 23:50:45 +0200 Subject: [PATCH] Adding option to return `baseRefOid` in `pr view` You need to know exact `baseRefOid` so you could show correct diff. `baseRefName` is not enough sometimes because branch from which PR was forked might have changes already. Example usage: ``` gh pr view --json headRefName,headRefOid,number,baseRefName,baseRefOid,reviewDecision ``` --- api/queries_pr.go | 1 + api/query_builder.go | 1 + pkg/cmd/pr/view/view_test.go | 1 + 3 files changed, 3 insertions(+) diff --git a/api/queries_pr.go b/api/queries_pr.go index 370f2db24..aa493b5e9 100644 --- a/api/queries_pr.go +++ b/api/queries_pr.go @@ -33,6 +33,7 @@ type PullRequest struct { Closed bool URL string BaseRefName string + BaseRefOid string HeadRefName string HeadRefOid string Body string diff --git a/api/query_builder.go b/api/query_builder.go index dbf889273..2112367e3 100644 --- a/api/query_builder.go +++ b/api/query_builder.go @@ -285,6 +285,7 @@ var PullRequestFields = append(sharedIssuePRFields, "additions", "autoMergeRequest", "baseRefName", + "baseRefOid", "changedFiles", "commits", "deletions", diff --git a/pkg/cmd/pr/view/view_test.go b/pkg/cmd/pr/view/view_test.go index 470e3bd27..e7f572c76 100644 --- a/pkg/cmd/pr/view/view_test.go +++ b/pkg/cmd/pr/view/view_test.go @@ -32,6 +32,7 @@ func TestJSONFields(t *testing.T) { "author", "autoMergeRequest", "baseRefName", + "baseRefOid", "body", "changedFiles", "closed",