Revert git.js changes

kenodegard · kenodegard · commit 2ddece4eeeb0 · 2024-05-06T09:01:39.000-05:00
diff --git a/src/git.js b/src/git.js
@@ -122,7 +122,7 @@ export default class Git {
 
 	async getBaseBranch() {
 		this.baseBranch = await execCmd(
-			`git branch --show-current`,
+			`git rev-parse --abbrev-ref HEAD`,
 			this.workingDir
 		)
 	}
@@ -201,7 +201,7 @@ export default class Git {
 
 	async getLastCommitSha() {
 		this.lastCommitSha = await execCmd(
-			`git log -1 --format='%H'`,
+			`git rev-parse HEAD`,
 			this.workingDir
 		)
 	}
@@ -547,4 +547,4 @@ export default class Git {
 		})
 		this.lastCommitSha = request.data.sha
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ export default class Git {`
`122`	`122`
`123`	`123`	`async getBaseBranch() {`
`124`	`124`	`this.baseBranch = await execCmd(`
`125`		- `git branch --show-current`,
	`125`	+ `git rev-parse --abbrev-ref HEAD`,
`126`	`126`	`this.workingDir`
`127`	`127`	`)`
`128`	`128`	`}`
`@@ -201,7 +201,7 @@ export default class Git {`
`201`	`201`
`202`	`202`	`async getLastCommitSha() {`
`203`	`203`	`this.lastCommitSha = await execCmd(`
`204`		- `git log -1 --format='%H'`,
	`204`	+ `git rev-parse HEAD`,
`205`	`205`	`this.workingDir`
`206`	`206`	`)`
`207`	`207`	`}`
`@@ -547,4 +547,4 @@ export default class Git {`
`547`	`547`	`})`
`548`	`548`	`this.lastCommitSha = request.data.sha`
`549`	`549`	`}`
`550`		`-}`
	`550`	`+}`