Skip to content

feat(packages/sui-mono): resolve git lock errors in commit-all when running from worktrees #1977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulusrex wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −19
Open

feat(packages/sui-mono): resolve git lock errors in commit-all when running from worktrees #1977

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions packages/sui-mono/bin/sui-mono-commit-all.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ const {message, type} = program.opts()
* @param {String} path Folder to check
* @return {Promise<Boolean>}
*/
const hasChangedFiles = async path => {
const hasChangedFiles = async (pkgPath, repoRoot) => {
let stdout = ''

try {
await exec(`git add .`, {cwd: path})
const status = await exec(`git status ${path} --porcelain`)
await exec(`git add ${pkgPath}`, {cwd: repoRoot})
const status = await exec(`git status ${pkgPath} --porcelain`, {cwd: repoRoot})
stdout = status.stdout || ''
} catch (error) {
console.error(error)
Expand All @@ -57,22 +57,26 @@ const hasChangedFiles = async path => {
*/
let commitsCount = 0

/**
* Functions that executes the commit for each package
* @type {Array<Function>}
*/
const checkStageFuncs = getWorkspaces().map(pkg => {
return () =>
hasChangedFiles(pkg).then(hasChanges => {
if (hasChanges) {
const packageName = pkg === '.' ? 'Root' : pkg
const args = ['commit', `-m "${type}(${packageName}): ${message}"`]
commitsCount++ && args.push('--no-verify') // precommit only once
return getSpawnPromise('git', args)
}
exec('git rev-parse --show-toplevel')
.then(({stdout}) => {
const repoRoot = stdout.trim()
/**
* Functions that executes the commit for each package
* @type {Array<Function>}
*/
const checkStageFuncs = getWorkspaces().map(pkg => {
return () =>
hasChangedFiles(pkg, repoRoot).then(hasChanges => {
if (hasChanges) {
const packageName = pkg === '.' ? 'Root' : pkg
const args = ['commit', `-m "${type}(${packageName}): ${message}"`]
commitsCount++ && args.push('--no-verify') // precommit only once
return getSpawnPromise('git', args, {cwd: repoRoot})
}
})
})
})

getSpawnPromise('git', ['reset']) // Unstage all prossible staged files
.then(() => checkStageFuncs.reduce((promise, func) => promise.then(func), Promise.resolve()))
return getSpawnPromise('git', ['reset'], {cwd: repoRoot}) // Unstage all possible staged files
.then(() => checkStageFuncs.reduce((promise, func) => promise.then(func), Promise.resolve()))
})
.catch(showError)
Loading