@staff0rd/assist 0.302.0 → 0.302.1
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/dist/index.js +19 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { Command } from "commander";
|
|
|
6
6
|
// package.json
|
|
7
7
|
var package_default = {
|
|
8
8
|
name: "@staff0rd/assist",
|
|
9
|
-
version: "0.302.
|
|
9
|
+
version: "0.302.1",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -2717,6 +2717,14 @@ import chalk26 from "chalk";
|
|
|
2717
2717
|
function pullIfConfigured() {
|
|
2718
2718
|
const config = loadConfig();
|
|
2719
2719
|
if (!config.commit?.pull) return;
|
|
2720
|
+
if (hasLocalChanges()) {
|
|
2721
|
+
console.warn(
|
|
2722
|
+
chalk26.yellow(
|
|
2723
|
+
"git pull skipped: working copy has local changes. Continuing."
|
|
2724
|
+
)
|
|
2725
|
+
);
|
|
2726
|
+
return;
|
|
2727
|
+
}
|
|
2720
2728
|
try {
|
|
2721
2729
|
execSync16("git pull --ff-only", { stdio: "inherit" });
|
|
2722
2730
|
} catch {
|
|
@@ -2724,6 +2732,16 @@ function pullIfConfigured() {
|
|
|
2724
2732
|
process.exit(1);
|
|
2725
2733
|
}
|
|
2726
2734
|
}
|
|
2735
|
+
function hasLocalChanges() {
|
|
2736
|
+
try {
|
|
2737
|
+
const status2 = execSync16("git status --porcelain", {
|
|
2738
|
+
encoding: "utf8"
|
|
2739
|
+
});
|
|
2740
|
+
return status2.trim().length > 0;
|
|
2741
|
+
} catch {
|
|
2742
|
+
return false;
|
|
2743
|
+
}
|
|
2744
|
+
}
|
|
2727
2745
|
|
|
2728
2746
|
// src/commands/backlog/acquireLock.ts
|
|
2729
2747
|
import {
|