diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2023-01-19 13:26:00 -0500 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2023-01-19 13:26:23 -0500 |
| commit | f2ef36c93d8edbc993e83caca10aeca95987f184 (patch) | |
| tree | 3c0bad64ea7fde9e9c5c76c97e1a5afc8bf835d2 | |
| parent | 22e506935733d25ddbc49cc5cce1cd0b21c002e4 (diff) | |
| download | b4-f2ef36c93d8edbc993e83caca10aeca95987f184.tar.gz | |
Revert "ez: don't use --fork-point with merge-base"
This reverts commit 22e506935733d25ddbc49cc5cce1cd0b21c002e4.
Apparently, this change broke tests, so back it out until we can
investigate better.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rw-r--r-- | b4/ez.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -226,8 +226,8 @@ def get_rev_count(revrange: str, maxrevs: Optional[int] = 500) -> int: def get_base_forkpoint(basebranch: str, mybranch: Optional[str] = None) -> str: if mybranch is None: mybranch = b4.git_get_current_branch() - logger.debug('Finding the merge-base with %s', basebranch) - gitargs = ['merge-base', basebranch] + logger.debug('Finding the fork-point with %s', basebranch) + gitargs = ['merge-base', '--fork-point', basebranch] lines = b4.git_get_command_lines(None, gitargs) if not lines: logger.critical('CRITICAL: Could not find common ancestor with %s', basebranch) |