@bobfrankston/npmglobalize 1.0.176 → 1.0.177
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/lib.js +4 -8
- package/package.json +1 -1
package/lib.js
CHANGED
|
@@ -4676,9 +4676,8 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
|
|
|
4676
4676
|
}
|
|
4677
4677
|
}
|
|
4678
4678
|
const commitStart = Date.now();
|
|
4679
|
-
console.log(` ${timestamp()} git commit ... (pre-commit hooks may run)`);
|
|
4680
4679
|
let commitResult = gitCommit(commitMsg, cwd);
|
|
4681
|
-
console.log(`
|
|
4680
|
+
console.log(` git commit done (${((Date.now() - commitStart) / 1000).toFixed(1)}s)`);
|
|
4682
4681
|
if (!commitResult.success) {
|
|
4683
4682
|
// Check for corrupted git index ("invalid object" / "Error building trees")
|
|
4684
4683
|
const errText = commitResult.stderr + commitResult.output;
|
|
@@ -4704,14 +4703,11 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
|
|
|
4704
4703
|
// Pull latest from remote before version bump to avoid push rejection
|
|
4705
4704
|
if (currentGitStatus.hasRemote && !dryRun) {
|
|
4706
4705
|
const pullStart = Date.now();
|
|
4707
|
-
|
|
4708
|
-
const heartbeat = setInterval(() =>
|
|
4709
|
-
const elapsed = ((Date.now() - pullStart) / 1000).toFixed(0);
|
|
4710
|
-
console.log(` ${timestamp()} ... still pulling (${elapsed}s elapsed)`);
|
|
4711
|
-
}, 10000);
|
|
4706
|
+
process.stdout.write(` git pull --rebase origin ${currentGitStatus.currentBranch} `);
|
|
4707
|
+
const heartbeat = setInterval(() => process.stdout.write('.'), 2000);
|
|
4712
4708
|
const pullResult = await runCommandAsync('git', ['pull', '--rebase', 'origin', currentGitStatus.currentBranch], { cwd, silent: true });
|
|
4713
4709
|
clearInterval(heartbeat);
|
|
4714
|
-
|
|
4710
|
+
process.stdout.write(` done (${((Date.now() - pullStart) / 1000).toFixed(1)}s)\n`);
|
|
4715
4711
|
if (!pullResult.success) {
|
|
4716
4712
|
console.error(colors.yellow('Warning: git pull --rebase failed before version bump'));
|
|
4717
4713
|
if (verbose) {
|