git_map.py - Issue 288323002: Make marked merge base invalid when the upstream changes.

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_map.py

Issue 288323002: Make marked merge base invalid when the upstream changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 7 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:

View side-by-side diff with in-line comments

Download patch

Index: git_map.py

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

index 6fec89d37f442b52f03cef733cb51634e9e4ef1a..65814b9f337becee3d85e697b7ab574ba9ee8fb9 100755

--- a/git_map.py

+++ b/git_map.py

@@ -50,6 +50,7 @@ def main():

current = current_branch()

all_branches = set(branches())

merge_base_map = {b: get_or_create_merge_base(b) for b in all_branches}

+ merge_base_map = {b: v for b, v in merge_base_map.iteritems() if v}

iannucci 2014/05/15 22:20:17 this fixes a bug for branches which have NO upstre

if current in all_branches:

all_branches.remove(current)

all_tags = set(tags())

« no previous file with comments | « git_common.py ('k') | git_mark_merge_base.py » ('j') | git_reparent_branch.py » ('J')