Skip to content

Commit 79562cd

Browse files
committed
allow --continue without providing initialBranch
Signed-off-by: Kipras Melnikovas <[email protected]>
1 parent 319ea6e commit 79562cd

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
@@ -1384,7 +1384,7 @@ git-stacked-rebase <branch> [-a|--apply]
13841384
2. but wil not push the partial branches to a remote until --push --force is used.
13851385
13861386
1387-
git-stacked-rebase <branch> [-c|--continue]
1387+
git-stacked-rebase [<branch>] (-c|--continue)
13881388
13891389
(!) should be used instead of git-rebase's --continue
13901390
@@ -1476,6 +1476,31 @@ git-stacked-rebase ${gitStackedRebaseVersionStr} __BUILD_DATE_REPLACEMENT_STR__
14761476
throw new Termination(helpMsg);
14771477
}
14781478

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

0 commit comments

Comments
 (0)