From 6332b152c6f6ff5c03a7fb41a45896d84a25ce1a Mon Sep 17 00:00:00 2001 From: "iannucci@chromium.org" Date: Thu, 15 May 2014 03:16:10 +0000 Subject: [PATCH] Make git_map properly update merge base markers. R=agable@chromium.org BUG= Review URL: https://codereview.chromium.org/288123003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270572 0039d316-1c4b-4281-b951-d872f2087c98 --- git_map.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git_map.py b/git_map.py index 14d7e7541..6fec89d37 100755 --- a/git_map.py +++ b/git_map.py @@ -19,7 +19,7 @@ import sys import subprocess2 from git_common import current_branch, branches, tags, config_list, GIT_EXE -from git_common import branch_config_map, root +from git_common import get_or_create_merge_base, root from third_party import colorama @@ -47,9 +47,9 @@ def main(): stdout=subprocess2.PIPE, shell=False) - merge_base_map = branch_config_map('base') current = current_branch() all_branches = set(branches()) + merge_base_map = {b: get_or_create_merge_base(b) for b in all_branches} if current in all_branches: all_branches.remove(current) all_tags = set(tags())