Commitf287d5d

authored

Merge pull requestcoderoad#496 from coderoad/fix/early-git-version

fix git issue pre-v2.28 due to master->main change

2 parentsdf5c95e +34714a3 commitf287d5dCopy full SHA for f287d5d

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import*asTTfrom'typings/tutorial'`
`2`	`2`	`import{exec,exists}from'../node'`
	`3`	`+import{version,compareVersions}from'../dependencies'`
`3`	`4`	`importloggerfrom'../logger'`
`4`	`5`
`5`	`6`	`exportconstgitOrigin='coderoad'`
`@@ -70,8 +71,22 @@ export async function clear(): Promise<Error \| void> {`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`asyncfunctioninit():Promise<Error\|void>{`
	`74`	`+constgitVersion=awaitversion('git')`
	`75`	`+if(!gitVersion){`
	`76`	`+thrownewError('Error: No git version found')`
	`77`	`+}`
	`78`	`+consthasInitialBranch=awaitcompareVersions(gitVersion,'>=2.28.0')`
	`79`	`+letstderr`
	`80`	`+if(hasInitialBranch){`
	`81`	`+// --initial-branch is introduced in git v2.28 when git changed the default master -> main`
	`82`	`+constinitResult=awaitexec({command:'git init --initial-branch=master'})`
	`83`	`+stderr=initResult.stderr`
	`84`	`+}else{`
	`85`	`+// pre git v2.28, master is default branch`
	`86`	`+constinitResult=awaitexec({command:'git init'})`
	`87`	`+stderr=initResult.stderr`
	`88`	`+}`
`73`	`89`	`// note: prevents stderr warning concerning default init branch`
`74`		`-const{ stderr}=awaitexec({command:'git init --initial-branch=master'})`
`75`	`90`	`if(stderr){`
`76`	`91`	thrownewError(`Error initializing Git:${stderr}`)
`77`	`92`	`}`

Comments

(0)