Skip to content

Commit

Permalink
Merge pull request #2143 from Abirdcfly/master
Browse files Browse the repository at this point in the history
  • Loading branch information
jesseduffield authored Sep 1, 2022
2 parents 25c4aa5 + d78d694 commit 74f9b8a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/commands/models/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (f *File) Names() []string {
return result
}

// returns true if the file names are the same or if a a file rename includes the filename of the other
// returns true if the file names are the same or if a file rename includes the filename of the other
func (f *File) Matches(f2 *File) bool {
return utils.StringArraysOverlap(f.Names(), f2.Names())
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/oscommands/cmd_obj_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (self *cmdObjRunner) runWithCredentialHandling(cmdObj ICmdObj) error {
promptFn = failPromptFn
case NONE:
// we should never land here
return errors.New("runWithCredentialHandling called but cmdObj does not have a a credential strategy")
return errors.New("runWithCredentialHandling called but cmdObj does not have a credential strategy")
}

return self.runAndDetectCredentialRequest(cmdObj, promptFn)
Expand Down

0 comments on commit 74f9b8a

Please sign in to comment.