Skip to content

Commit

Permalink
Fix spelling errors (#412)
Browse files Browse the repository at this point in the history
  • Loading branch information
draftcode authored Sep 4, 2024
1 parent 6fec05b commit 71cd2fc
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion e2e_tests/stack_restack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestStackRestack(t *testing.T) {
stack1Head := repo.GetCommitAtRef(t, plumbing.NewBranchReferenceName("stack-1"))
require.Equal(t, mergeBases[0], stack1Head, "stack-2 should be up-to-date with stack-1")

// Further sync attemps should yield no-ops
// Further sync attempts should yield no-ops
syncNoop := RequireAv(t, "stack", "restack")
require.Contains(t, syncNoop.Stdout, "Restack is done")

Expand Down
2 changes: 1 addition & 1 deletion e2e_tests/stack_sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func TestStackSync(t *testing.T) {
stack1Head := repo.GetCommitAtRef(t, plumbing.NewBranchReferenceName("stack-1"))
require.Equal(t, mergeBases[0], stack1Head, "stack-2 should be up-to-date with stack-1")

// Further sync attemps should yield no-ops
// Further sync attempts should yield no-ops
syncNoop := RequireAv(t, "stack", "sync")
require.Contains(t, syncNoop.Stdout, "Restack is done")

Expand Down
2 changes: 1 addition & 1 deletion internal/actions/pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func CreatePullRequest(
}

// Otherwise, save what the user entered to a file so that it's not
// lost forever (and we can re-use it if they try again).
// lost forever (and we can reuse it if they try again).
savePRDescriptionToTemporaryFile(saveFile, res)
}()
}
Expand Down
8 changes: 4 additions & 4 deletions internal/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,9 @@ func (r *Repo) RevParse(rp *RevParse) (string, error) {
return r.Git(args...)
}

func (r *Repo) MergeBase(commitishes ...string) (string, error) {
func (r *Repo) MergeBase(committishes ...string) (string, error) {
args := []string{"merge-base"}
args = append(args, commitishes...)
args = append(args, committishes...)
str, err := r.Git(args...)
if err != nil {
return "", err
Expand All @@ -363,11 +363,11 @@ type BranchAndCommit struct {
Branch string
}

func (r *Repo) BranchesContainCommitish(commitish string) ([]BranchAndCommit, error) {
func (r *Repo) BranchesContainCommittish(committish string) ([]BranchAndCommit, error) {
lines, err := r.Git(
"for-each-ref",
"--contains",
commitish,
committish,
"--format=%(objectname) %(refname:short)",
"refs/heads",
)
Expand Down
2 changes: 1 addition & 1 deletion internal/git/gittest/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func NewTempRepoWithGitHubServer(t *testing.T, serverURL string) *GitTestRepo {

settings := map[string]string{
"user.name": "av-test",
"user.email": "av-test@nonexistant",
"user.email": "av-test@nonexistent",
}
for k, v := range settings {
repo.Git(t, "config", k, v)
Expand Down

0 comments on commit 71cd2fc

Please sign in to comment.