Commit graph

5685 commits

Author SHA1 Message Date
Tyler McGoffin
cdead50d57 Moved remote.pushDefault out of ReadBranchConfig and into finder 2025-01-24 11:05:15 -08:00
Tyler McGoffin
e4d8ed0e60 Remove @{push} from branch config 2025-01-24 10:20:04 -08:00
Tyler McGoffin
5a8dd35ba7 Add PushDefault method to git client 2025-01-24 09:40:02 -08:00
Meredith Lancaster
6c0cdca554 Merge remote-tracking branch 'upstream/trunk' into attestation-verify-ref-commit-policy-opts 2025-01-24 09:32:18 -07:00
Meredith Lancaster
5df2b47d1f update tests
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-24 09:30:46 -07:00
Meredith Lancaster
2f81a33e95 add new signing options
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-24 09:28:55 -07:00
William Martin
6355ed7c08 WIP: push default defaults to simple 2025-01-24 17:25:38 +01:00
William Martin
a72bef9b42 Error if push revision doesn't match a remote 2025-01-24 17:07:24 +01:00
Tyler McGoffin
41729b004d Refactor finder.Find and replace parseCurrentBranch with parsePRRefs
I've been struggling horribly to reason through all of this code, and
after much mental gymnastics I identified the culprit as the overloaded
"branch" string returned by parseCurrentBranch.

This value was either the name of the branch that the PR we're looking for
is associated with, or that name prepended with the owner's name and a :
if we're on a branch, so:

PR branch: featureBranch
branch == "featureBranch"

If on Fork belonging to "ForkOwner"
branch == "ForkOwner:featureBranch"

Since this extra information was bundled up into this single string, it
complicated the responsibilities of parseCurrentBranch's "branch" return
value. Thus, I've teased out "branch" into the new PRRefs struct:

type PRRefs struct{
	BranchName string
	HeadRepo ghrepo.Interface
	BaseRepo ghrepo.Interface
}

This allows the new parsePRRefs function to move all the previous
"branch" string's information into structured data, and allows for a new
method on PRRefs, GetPRLabel(), to create the string that "branch"
previously held to pass into its downstream consumer, namely
findForBranch.

This also allowed for better test coverage, directly connecting the PRRefs
fields to the values contained in the git config. Overall, I am now
confident that this is doing what its supposed to do with respect to my
understanding of the various central and triangular git workflows we are
addressing.
2025-01-23 15:25:28 -08:00
Meredith Lancaster
840fe2198c
Merge branch 'trunk' into attestation-bundle-fetch-improvements 2025-01-23 12:46:22 -07:00
Meredith Lancaster
c0c1618e50
Merge pull request #10104 from malancas/update-attestation-verify-table-output
Update `gh attestation verify` table output
2025-01-23 12:38:55 -07:00
Michael Hoffman
363bfd9520
Merge branch 'trunk' into create-autolinks 2025-01-23 12:55:30 -05:00
Meredith Lancaster
5624ed8ebc Merge branch 'update-attestation-verify-table-output' of github.com:malancas/cli into update-attestation-verify-table-output 2025-01-23 07:47:50 -07:00
Meredith Lancaster
4134f9606e remove bolding from bullet point output
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-23 07:47:38 -07:00
Otto Kekäläinen
b19e682455
Update test to be compatible with latest Glamour v0.8.0
Latest Glamour has slightly changed logic in line length / wrapping,
resulting test failures due to string mismatch. Update tests and bump
dependency to v0.8.0, and others to the bare minimal level as generated
by `go mod tidy`.

This was detected then building the GitHub cli package `gh` in Debian
started to fail with src:golang-github-charmbracelet-glamour 0.8.0-1.

Closes: #10179
2025-01-22 20:13:40 -08:00
Meredith Lancaster
6d48557f7d
Merge branch 'trunk' into update-attestation-verify-table-output 2025-01-22 13:28:45 -07:00
Meredith Lancaster
5f6e720a50 reorder policy enforcement criteria print out
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-22 13:27:56 -07:00
Meredith Lancaster
2ec70a5dc3 bold bullet point list header text
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-22 13:22:45 -07:00
petercover
bad7098cfe chore: fix some comments
Signed-off-by: petercover <raowanxiang@outlook.com>
2025-01-23 00:47:27 +08:00
William Martin
1bd07b9477
Merge pull request #10279 from mikelolasagasti/go-1.24-printf
Bump golangci-linter and address failures to prepare for Go 1.24 strictness
2025-01-22 12:08:39 +01:00
Tyler McGoffin
e0d3b9181a
Merge pull request #10227 from iamrajhans/rerun-err-msg
show error message for rerun workflow older than a month ago
2025-01-21 13:14:24 -08:00
William Martin
0a3706a404 Remove unncessary printf usage 2025-01-21 18:04:47 +01:00
William Martin
0ead3398a7 Bump golang ci lint to work with go 1.24 2025-01-21 17:55:39 +01:00
William Martin
ff922353bb
Merge pull request #10209 from cli/wm/add-remote-check-to-secret
Require repo disambiguation for secret commands
2025-01-21 15:24:49 +01:00
Rajhans Jadhao
211aaefc39
Merge branch 'trunk' into rerun-err-msg 2025-01-21 10:38:23 +05:30
Michael Hoffman
87f414174b
Merge branch 'trunk' into create-autolinks 2025-01-20 13:56:07 -05:00
Mikel Olasagasti Uranga
4396e40a31 Fix: Ensure constant format strings in fmt and printf calls
Go 1.24 introduces stricter checks for format string validation.
This commit fixes instances where non-constant format strings were
used in calls to functions like `fmt.Errorf`, `fmt.Printf`, and similar.

Signed-off-by: Mikel Olasagasti Uranga <mikel@olasagasti.info>
2025-01-20 16:27:27 +01:00
Kynan Ware
facd0caa29 Fix: accidental whitespace in gist edit 2025-01-16 11:44:46 -07:00
Kynan Ware
5b6fd53a88 Fix: gist edit test name 2025-01-16 11:36:48 -07:00
Kynan Ware
dec46670bb Fix: gist edit/view tests var name consistency 2025-01-16 11:14:33 -07:00
Kynan Ware
a2dce589d6 Merge 'trunk' into fix/issue_10042 2025-01-16 11:06:36 -07:00
Kynan Ware
35d81e3ff5 Fix: Gist edit tests for interactivity
This changes the gist edit tests to use the positive `istty` instead of the previous inverse `nontty`, which is consistent with the way other commands are written.
2025-01-16 10:46:07 -07:00
Andy Feller
8288011149
Merge pull request #10239 from cli/andyfeller/10235-non-blocking-ext-update
Make extension update check non-blocking
2025-01-16 08:40:39 -05:00
William Martin
cc4bf0fc9f Add small wait to extension update tests 2025-01-16 14:10:42 +01:00
Andy Feller
243acaf579 Refactor test based on PR feedback 2025-01-16 00:08:45 -05:00
Rajhans Jadhao
143d628f1b
Merge branch 'trunk' into rerun-err-msg 2025-01-16 09:02:31 +05:30
Tyler McGoffin
d289ddd617 Use PushRemoteURL instead of RemoteURL in prSelectorForCurrentBranch 2025-01-15 16:21:06 -08:00
Tyler McGoffin
4a9fd9508f Add comments and a bit of code cleanup 2025-01-15 16:13:03 -08:00
Meredith Lancaster
5d26f0b767 skip check
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-15 14:39:22 -07:00
Meredith Lancaster
daf63543ea add tty check
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-15 14:33:13 -07:00
Meredith Lancaster
423a764f2a
Merge branch 'trunk' into update-attestation-verify-table-output 2025-01-15 14:25:38 -07:00
Meredith Lancaster
4fb265c597 formatting
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-15 14:22:05 -07:00
Meredith Lancaster
6d2f71d0f4 delete unused function
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-15 14:17:49 -07:00
Meredith Lancaster
4967eaff8b Merge branch 'update-attestation-verify-table-output' of github.com:malancas/cli into update-attestation-verify-table-output 2025-01-15 14:13:22 -07:00
Meredith Lancaster
555c9b65f5 drop unused handler method
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-15 14:13:16 -07:00
Meredith Lancaster
2ffce8ae9f print attestation output info as bullet points instead of table
Signed-off-by: Meredith Lancaster <malancas@github.com>
2025-01-15 14:11:54 -07:00
William Martin
e7ffb1e435 Fix typo in secret base repo selection comment 2025-01-15 14:55:18 +01:00
William Martin
88a64d2a11 Change wording on secret repo prompt 2025-01-15 14:55:17 +01:00
William Martin
b382b24728 Print informative message before prompting for secret repo 2025-01-15 14:55:17 +01:00
William Martin
a47327aee6 Secret base repo prompting should not use resolved remote
This is because the secret commands don't use the SmartBaseRepo behaviour, and therefore
don't care about the resolved remote.
2025-01-15 14:55:17 +01:00