Skip to content

Commit 2a6827b

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

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

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

0 commit comments

Comments
 (0)