git-stack-cli 2.9.5 → 2.9.6
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/js/index.js +24 -24
- package/package.json +1 -1
- package/src/app/ManualRebase.tsx +1 -0
- package/src/commands/Rebase.tsx +1 -0
- package/src/core/CommitMetadata.ts +7 -0
package/package.json
CHANGED
package/src/app/ManualRebase.tsx
CHANGED
|
@@ -147,6 +147,7 @@ async function run() {
|
|
|
147
147
|
// always hard reset and clean to allow subsequent checkout
|
|
148
148
|
// if there are files checkout will fail and cascade fail subsequent commands
|
|
149
149
|
cli.sync(`git reset --hard`, spawn_options);
|
|
150
|
+
cli.sync(`git cherry-pick --abort`, spawn_options);
|
|
150
151
|
cli.sync(`git clean -fd`, spawn_options);
|
|
151
152
|
|
|
152
153
|
// always put self back in original branch
|
package/src/commands/Rebase.tsx
CHANGED
|
@@ -184,6 +184,7 @@ Rebase.run = async function run(props: Props) {
|
|
|
184
184
|
// always hard reset and clean to allow subsequent checkout
|
|
185
185
|
// if there are files checkout will fail and cascade fail subsequent commands
|
|
186
186
|
cli.sync(`git reset --hard`, spawn_options);
|
|
187
|
+
cli.sync(`git cherry-pick --abort`, spawn_options);
|
|
187
188
|
cli.sync(`git clean -fd`, spawn_options);
|
|
188
189
|
|
|
189
190
|
// always put self back in original branch
|
|
@@ -260,14 +260,21 @@ export async function range(commit_group_map?: CommitGroupMap) {
|
|
|
260
260
|
const all_commits: Array<git.Commit> = [];
|
|
261
261
|
const previous_groups = group_value_list.slice(0, i);
|
|
262
262
|
for (const g of previous_groups) {
|
|
263
|
+
actions.debug(` BOUNDARY_COMMIT group=${g.title}`);
|
|
264
|
+
|
|
263
265
|
for (const c of g.commits) {
|
|
266
|
+
actions.debug(` BOUNDARY_COMMIT commit=${c.subject_line}`);
|
|
264
267
|
all_commits.push(c);
|
|
265
268
|
}
|
|
266
269
|
}
|
|
267
270
|
for (const c of group.commits) {
|
|
271
|
+
actions.debug(` BOUNDARY_COMMIT commit=${c.subject_line}`);
|
|
268
272
|
all_commits.push(c);
|
|
269
273
|
}
|
|
270
274
|
|
|
275
|
+
actions.debug(` BOUNDARY_COMMIT group.pr.commits.length=${group.pr.commits.length}`);
|
|
276
|
+
actions.debug(` BOUNDARY_COMMIT all_commits=${all_commits.length}`);
|
|
277
|
+
|
|
271
278
|
// compare all commits against pr commits
|
|
272
279
|
if (group.pr.commits.length !== all_commits.length) {
|
|
273
280
|
actions.debug(" BOUNDARY_COMMIT_LENGTH_MISMATCH");
|