git_common.py - Issue 1888213004: Fix ancestor check

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_common.py

Issue 1888213004: Fix ancestor check (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: git_common.py

diff --git a/git_common.py b/git_common.py

index bef628e407b16074183928040a33a0bf8bd85bcc..b7626e8a3ed4d81434443ef15e427c2cae2bf89a 100644

--- a/git_common.py

+++ b/git_common.py

@@ -437,7 +437,7 @@ def get_or_create_merge_base(branch, parent=None):

def is_ancestor(a, b):

return run_with_retcode('merge-base', '--is-ancestor', a, b) == 0

- if base:

+ if base and base != actual_merge_base:

if not is_ancestor(base, branch):

logging.debug('Found WRONG pre-set merge-base for %s: %s', branch, base)

base = None

« no previous file with comments | « no previous file | no next file » | no next file with comments »