Skip to content

Commit 7dbde78

Browse files
Fix rebase issue on branches with less than 5 commits
Signed-off-by: Jacob Stopak <jacob@initialcommit.io>
1 parent ebc3c15 commit 7dbde78

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

git_sim/git_sim_rebase.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ def construct(self):
6666

6767
reached_base = False
6868
for commit in self.commits:
69-
if self.args.branch[0] in self.repo.git.branch("--contains", commit):
69+
if commit != "dark" and self.args.branch[0] in self.repo.git.branch(
70+
"--contains", commit
71+
):
7072
reached_base = True
7173

7274
self.parse_commits(

0 commit comments

Comments
 (0)