Skip to content

Commit

Permalink
fix: stack calculation when master lags origin
Browse files Browse the repository at this point in the history
  • Loading branch information
stevearc committed Jan 19, 2024
1 parent 9c90da8 commit dca5cf5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def refs_between(ref1: str, ref2: str) -> List[str]:
@staticmethod
def merge_base(branch: str, ref2: Optional[str] = None) -> str:
if ref2 is None:
ref2 = git.get_main_branch()
ref2 = git.get_origin_main()
return run("git", "merge-base", branch, ref2)

@staticmethod
Expand Down

0 comments on commit dca5cf5

Please sign in to comment.