Skip to content

Commit 8310261

Browse files
committed
Update to point to main branch
1 parent c60d699 commit 8310261

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/workflows/pr-validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v2
1111
- uses: actions/setup-node@v1
1212
with:
13-
node-version: '12.8.x'
13+
node-version: '16.14.x'
1414
- run: npm install
1515
- run: npm run vscode:prepublish
1616
- run: npm run test

.github/workflows/release-on-tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v1
1414
with:
15-
node-version: '12.8.x'
15+
node-version: '16.14.x'
1616
- run: npm install [email protected] -g
1717
- name: Write PreRelease Notes
1818
env:
1919
GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
GITHUB_EVENT_REF: ${{ github.event.ref }}
2121
run: |
2222
tagname="${GITHUB_EVENT_REF/refs\/tags\//}"
23-
gren release --override -d --tags=$tagname
23+
gren release --override -d --tags=$tagname

.github/workflows/vsce-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v1
1414
with:
15-
node-version: '12.8.x'
15+
node-version: '16.14.x'
1616
- run: npm install
1717
- run: npm install -g vsce github-release-notes
1818
- name: Read package.json verison
@@ -22,8 +22,8 @@ jobs:
2222
env:
2323
GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
run: |
25-
git fetch origin master
26-
git checkout master
25+
git fetch origin main
26+
git checkout main
2727
gren changelog --override
2828
git -c user.name="ole1986" -c user.email="[email protected]" commit --no-verify -m "Updated CHANGELOG.md - Github Actions" -- CHANGELOG.md
2929
git push

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ You can add keyboard short cuts for the above commands by following the directio
3535

3636
NOTE: The file for which the history is to be viewed, must already be opened.
3737

38-
![Image of Git Log](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/gitLogv3.gif)
38+
![Image of Git Log](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/gitLogv3.gif)
3939

40-
![Image of File History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/fileHistoryCommandv3.gif)
40+
![Image of File History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/fileHistoryCommandv3.gif)
4141

42-
![Image of Line History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/lineHistoryCommandv3.gif)
42+
![Image of Line History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/lineHistoryCommandv3.gif)
4343

44-
![Image of Compare](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/compareCommits.gif)
44+
![Image of Compare](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/compareCommits.gif)
4545

4646

4747
## Source
@@ -52,4 +52,4 @@ NOTE: The file for which the history is to be viewed, must already be opened.
5252

5353
## License
5454

55-
[MIT](https://raw.githubusercontent.com/DonJayamanne/bowerVSCode/master/LICENSE)
55+
[MIT](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/LICENSE)

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "githistory",
33
"displayName": "Git History",
44
"description": "View git log, file history, compare branches or commits",
5-
"version": "0.6.19",
5+
"version": "0.6.20",
66
"publisher": "donjayamanne",
77
"author": {
88
"name": "Don Jayamanne",
99
"email": "[email protected]"
1010
},
1111
"license": "MIT",
12-
"homepage": "https://github.com/DonJayamanne/gitHistoryVSCode/blob/master/README.md",
12+
"homepage": "https://github.com/DonJayamanne/gitHistoryVSCode/blob/main/README.md",
1313
"repository": {
1414
"type": "git",
1515
"url": "https://github.com/DonJayamanne/gitHistoryVSCode"
@@ -23,7 +23,7 @@
2323
"theme": "dark"
2424
},
2525
"engines": {
26-
"vscode": "^1.46.0"
26+
"vscode": "^1.76.0"
2727
},
2828
"categories": [
2929
"Other"

src/adapter/repository/git.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class Git implements IGitService {
7878
let remoteUrl: string | undefined = undefined;
7979

8080
// fetch the remote from local branch using upstreamRef (received only with getBranch)
81-
const remoteName = (await this.repo.getBranch(r.name || 'master')).upstream?.remote;
81+
const remoteName = (await this.repo.getBranch(r.name || 'main')).upstream?.remote;
8282

8383
if (remoteName) {
8484
remoteUrl = this.repo.state.remotes.find(x => x.name === remoteName)?.fetchUrl;

0 commit comments

Comments
 (0)