gcf-aif-ext 0.7.2 → 0.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/extension.json +1 -1
- package/lib/integrate.js +2 -0
- package/package.json +1 -1
package/extension.json
CHANGED
package/lib/integrate.js
CHANGED
|
@@ -302,6 +302,8 @@ export async function integrate(projectDir, ids = []) {
|
|
|
302
302
|
throw new Error(`integrate runs in the main checkout on its branch, not on ${branch}`);
|
|
303
303
|
|
|
304
304
|
return withMainLock(projectDir, async () => {
|
|
305
|
+
// Nothing to merge leaves main alone: a run's first integrate must not refuse a dirty tree.
|
|
306
|
+
if (!ids.length && !verifiedBranches(projectDir).length) return [];
|
|
305
307
|
if (git(projectDir, ['status', '--porcelain', '--untracked-files=no', '--', '.', METRICS]).out)
|
|
306
308
|
throw new Error('main has uncommitted changes: commit or stash them before integrating');
|
|
307
309
|
commitMetrics(projectDir);
|