@@ -120,10 +120,9 @@ export async function gitCreateAndPushBranchIfNeeded(
120120 cwd = process . cwd ( )
121121) : Promise < boolean > {
122122 if ( await gitBranchExists ( branch , cwd ) ) {
123- logger . warn ( `Branch "${ branch } " already exists. Skipping creation.` )
124- return false
123+ logger . warn ( `Branch "${ branch } " already exists, skipping creation.` )
124+ return true
125125 }
126- await spawn ( 'git' , [ 'checkout' , '-b' , branch ] , { cwd } )
127126 const moddedFilepaths = ( await gitUnstagedModifiedFiles ( cwd ) ) . filter ( p => {
128127 const basename = path . basename ( p )
129128 return (
@@ -132,9 +131,12 @@ export async function gitCreateAndPushBranchIfNeeded(
132131 basename === 'pnpm-lock.yaml'
133132 )
134133 } )
135- if ( moddedFilepaths . length ) {
136- await spawn ( 'git' , [ 'add' , ...moddedFilepaths ] , { cwd } )
134+ if ( ! moddedFilepaths . length ) {
135+ logger . warn ( 'Nothing to commit, skipping push.' )
136+ return false
137137 }
138+ await spawn ( 'git' , [ 'checkout' , '-b' , branch ] , { cwd } )
139+ await spawn ( 'git' , [ 'add' , ...moddedFilepaths ] , { cwd } )
138140 await spawn ( 'git' , [ 'commit' , '-m' , commitMsg ] , { cwd } )
139141 await spawn ( 'git' , [ 'push' , '--set-upstream' , 'origin' , branch ] , { cwd } )
140142 return true
0 commit comments