diff options
author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2023-01-19 12:53:12 -0500 |
---|---|---|
committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2023-01-19 12:53:12 -0500 |
commit | 22e506935733d25ddbc49cc5cce1cd0b21c002e4 (patch) | |
tree | db8bd9bf41ca440a3a114dfe6b0af9580202e1f7 | |
parent | d5b6dddce2ae5820091f1dcb7f04d10b855556cd (diff) | |
download | b4-22e506935733d25ddbc49cc5cce1cd0b21c002e4.tar.gz |
ez: don't use --fork-point with merge-base
Per discussion, don't use --fork-point when calling git-merge-base. We
don't really want the historically accurate forkpoing point for our
purposes, we just need to find the nearest common commit with the
tracking branch.
Suggested-by: Vishal Verma <vishal@kernel.org>
Link: https://msgid.link/f886465ad1b69fad361aab450fbbc2fca14326b1.camel@kernel.org
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 fork-point with %s', basebranch) - gitargs = ['merge-base', '--fork-point', basebranch] + logger.debug('Finding the merge-base with %s', basebranch) + gitargs = ['merge-base', basebranch] lines = b4.git_get_command_lines(None, gitargs) if not lines: logger.critical('CRITICAL: Could not find common ancestor with %s', basebranch) |