Skip to content

fix: Actually use mainBranches setting #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 3 commits into from
May 26, 2022
Merged

fix: Actually use mainBranches setting #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37d9c84
fix: Actually use `mainBranches` setting
cvx May 24, 2022
a0a0ced
changelog
chdsbd May 26, 2022
117c4a7
version
chdsbd May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## 2.0.1 - 2022-05-26

### Fixed

- `mainBranches` configuration option not being used. Thanks @CvX! (#56)

## 2.0.0 - 2021-12-09

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "githubinator",
"displayName": "Githubinator",
"description": "Quickly open files on Github and other providers. View blame information, copy permalinks and more. See the \"commands\" section of the README for more details.",
"version": "1.1.1",
"version": "2.0.1",
"publisher": "chdsbd",
"license": "SEE LICENSE IN LICENSE",
"icon": "images/logo256.png",
Expand Down
10 changes: 7 additions & 3 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,16 @@ function getEditorInfo(): { uri: vscode.Uri | null; fileName: string | null } {
return { uri, fileName }
}

const BRANCHES = ["main", "master", "trunk", "dev", "develop"]
function mainBranches() {
return vscode.workspace
.getConfiguration("githubinator")
.get<string[]>("mainBranches", ["main"])
}

async function findShaForBranches(
gitDir: string,
): Promise<[string, string] | null> {
for (let branch of BRANCHES) {
for (let branch of mainBranches()) {
const sha = await git.getSHAForBranch(gitDir, branch)
if (sha == null) {
continue
Expand Down Expand Up @@ -171,7 +175,7 @@ async function githubinator({
if (mainBranch) {
const res = await findShaForBranches(gitDir)
if (res == null) {
return err(`Could not find SHA for branch in ${BRANCHES}`)
return err(`Could not find SHA for branch in ${mainBranches()}`)
}
headBranch = res
} else {
Expand Down