Skip to content

Commit b08f2a9

Browse files
committed
allow --continue without providing initialBranch
Signed-off-by: Kipras Melnikovas <[email protected]>
1 parent 1046c12 commit b08f2a9

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

git-stacked-rebase.ts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ git-stacked-rebase <branch> [-a|--apply]
13751375
2. but wil not push the partial branches to a remote until --push --force is used.
13761376
13771377
1378-
git-stacked-rebase <branch> [-c|--continue]
1378+
git-stacked-rebase [<branch>] (-c|--continue)
13791379
13801380
(!) should be used instead of git-rebase's --continue
13811381
@@ -1467,6 +1467,31 @@ git-stacked-rebase ${gitStackedRebaseVersionStr} __BUILD_DATE_REPLACEMENT_STR__
14671467
throw new Termination(helpMsg);
14681468
}
14691469

1470+
if (["--continue", "-c"].includes(nameOfInitialBranch) && !process.argv.length) {
1471+
console.log("--continue without initialBranch");
1472+
1473+
/**
1474+
* TODO allow `null` / make optional
1475+
*
1476+
* both will need some intellisense to only allow
1477+
* in specific cases
1478+
*
1479+
* (unless we'll keep track of the
1480+
* current initial branch we're working with?)
1481+
*
1482+
*/
1483+
const initialBranch = "";
1484+
1485+
/**
1486+
* TODO call more appropraitely / extract default options
1487+
* so that it's less error-prone here
1488+
*/
1489+
return gitStackedRebase(initialBranch, {
1490+
gitDir,
1491+
continue: true,
1492+
});
1493+
}
1494+
14701495
/**
14711496
* TODO: improve arg parsing, lmao
14721497
*/

0 commit comments

Comments
 (0)