@rallycry/conveyor-agent 9.0.2 → 9.0.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.
Files changed (5) hide show
  1. package/dist/{chunk-5W6MHROF.js → chunk-EYIGNRRW.js} +13 -2
  2. package/dist/{chunk-5W6MHROF.js.map → chunk-EYIGNRRW.js.map} +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/index.js +1 -1
  5. package/package.json +1 -1
package/dist/{chunk-5W6MHROF.js → chunk-EYIGNRRW.js} RENAMED
@@ -1058,7 +1058,18 @@ function restoreWipSnapshot(cwd, branch) {
1058
1058
  stdio: ["ignore", "pipe", "ignore"]
1059
1059
  }).toString().trim();
1060
1060
  const head = execSync("git rev-parse HEAD", { cwd, stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
1061
- if (parent !== head) return "stale";
1061
+ if (parent !== head) {
1062
+ try {
1063
+ execSync(`git stash apply ${sha}`, { cwd, stdio: ["ignore", "pipe", "pipe"] });
1064
+ return "applied";
1065
+ } catch {
1066
+ try {
1067
+ execSync("git reset --merge", { cwd, stdio: "ignore" });
1068
+ } catch {
1069
+ }
1070
+ return "stale";
1071
+ }
1072
+ }
1062
1073
  execSync(`git stash apply ${sha}`, { cwd, stdio: ["ignore", "pipe", "pipe"] });
1063
1074
  return "applied";
1064
1075
  } catch {
@@ -8882,4 +8893,4 @@ export {
8882
8893
  runStartCommand,
8883
8894
  unshallowRepo
8884
8895
  };
8885
- //# sourceMappingURL=chunk-5W6MHROF.js.map
8896
+ //# sourceMappingURL=chunk-EYIGNRRW.js.map