Update to point to main branch

.github/workflows/pr-validate.yml

@@ -10,7 +10,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '12.8.x'
+        node-version: '16.14.x'
     - run: npm install
     - run: npm run vscode:prepublish
     - run: npm run test

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

@@ -12,12 +12,12 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '12.8.x'
+        node-version: '16.14.x'
     - run: npm install github-release-notes@0.17.1 -g
     - name: Write PreRelease Notes
       env:
         GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_EVENT_REF: ${{ github.event.ref }}
       run: |
         tagname="${GITHUB_EVENT_REF/refs\/tags\//}"
-        gren release --override -d --tags=$tagname
+        gren release --override -d --tags=$tagname

.github/workflows/vsce-publish.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '12.8.x'
+        node-version: '16.14.x'
     - run: npm install
     - run: npm install -g vsce github-release-notes
     - name: Read package.json verison
@@ -22,8 +22,8 @@ jobs:
       env:
         GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        git fetch origin master
-        git checkout master
+        git fetch origin main
+        git checkout main
         gren changelog --override
         git -c user.name="ole1986" -c user.email="ole.k@web.de" commit --no-verify -m "Updated CHANGELOG.md - Github Actions" -- CHANGELOG.md
         git push

README.md

@@ -35,13 +35,13 @@ You can add keyboard short cuts for the above commands by following the directio
 
 NOTE: The file for which the history is to be viewed, must already be opened.
 
-![Image of Git Log](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/gitLogv3.gif)
+![Image of Git Log](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/gitLogv3.gif)
 
-![Image of File History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/fileHistoryCommandv3.gif)
+![Image of File History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/fileHistoryCommandv3.gif)
 
-![Image of Line History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/lineHistoryCommandv3.gif)
+![Image of Line History](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/lineHistoryCommandv3.gif)
 
-![Image of Compare](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/master/images/compareCommits.gif)
+![Image of Compare](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/images/compareCommits.gif)
 
 
 ## Source
@@ -52,4 +52,4 @@ NOTE: The file for which the history is to be viewed, must already be opened.
 
 ## License
 
-[MIT](https://raw.githubusercontent.com/DonJayamanne/bowerVSCode/master/LICENSE)
+[MIT](https://raw.githubusercontent.com/DonJayamanne/gitHistoryVSCode/main/LICENSE)

package.json

@@ -2,14 +2,14 @@
     "name": "githistory",
     "displayName": "Git History",
     "description": "View git log, file history, compare branches or commits",
-    "version": "0.6.19",
+    "version": "0.6.20",
     "publisher": "donjayamanne",
     "author": {
         "name": "Don Jayamanne",
         "email": "don.jayamanne@yahoo.com"
     },
     "license": "MIT",
-    "homepage": "https://github.com/DonJayamanne/gitHistoryVSCode/blob/master/README.md",
+    "homepage": "https://github.com/DonJayamanne/gitHistoryVSCode/blob/main/README.md",
     "repository": {
         "type": "git",
         "url": "https://github.com/DonJayamanne/gitHistoryVSCode"
@@ -23,7 +23,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.46.0"
+        "vscode": "^1.76.0"
     },
     "categories": [
         "Other"

src/adapter/repository/git.ts

@@ -78,7 +78,7 @@ export class Git implements IGitService {
                 let remoteUrl: string | undefined = undefined;
 
                 // fetch the remote from local branch using upstreamRef (received only with getBranch)
-                const remoteName = (await this.repo.getBranch(r.name || 'master')).upstream?.remote;
+                const remoteName = (await this.repo.getBranch(r.name || 'main')).upstream?.remote;
 
                 if (remoteName) {
                     remoteUrl = this.repo.state.remotes.find(x => x.name === remoteName)?.fetchUrl;