tools/release/common_includes.py - Issue 932703002: Fix typo in merge script.

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: tools/release/common_includes.py

Issue 932703002: Fix typo in merge script. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 5 years, 10 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: tools/release/common_includes.py

diff --git a/tools/release/common_includes.py b/tools/release/common_includes.py

index 0238d95244331a2b29d8b51ebf547bd0f8512e7f..03b0c5b7d49fc3fe9d4149523e5da2b4af5c86af 100644

--- a/tools/release/common_includes.py

+++ b/tools/release/common_includes.py

@@ -339,10 +339,10 @@ class GitInterface(VCInterface):

if name in ["candidates", "master"]:

return "refs/remotes/origin/%s" % name

# Check if branch is in heads.

- if self.Git("show-ref refs/remotes/origin/%s" % name).strip():

+ if self.step.Git("show-ref refs/remotes/origin/%s" % name).strip():

return "refs/remotes/origin/%s" % name

# Check if branch is in branch-heads.

- if self.Git("show-ref refs/remotes/branch-heads/%s" % name).strip():

+ if self.step.Git("show-ref refs/remotes/branch-heads/%s" % name).strip():

return "refs/remotes/branch-heads/%s" % name

self.Die("Can't find remote of %s" % name)

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