tools/push-to-trunk/git_recipes.py - Issue 203773013: Retrieve current version from trunk branch in push-to-trunk.

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/push-to-trunk/git_recipes.py

Issue 203773013: Retrieve current version from trunk branch in push-to-trunk. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 9 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: tools/push-to-trunk/git_recipes.py

diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py

index 7d9c4026e217a46e9461e6a41b15ef237e6f7252..8e84d4533b230814ac80bf4c66eef03cab40e04c 100644

--- a/tools/push-to-trunk/git_recipes.py

+++ b/tools/push-to-trunk/git_recipes.py

@@ -63,10 +63,10 @@ class GitRecipesMixin(object):

assert name

self.Git(MakeArgs(["checkout -f", name]))

- def GitCheckoutFile(self, name, branch):

+ def GitCheckoutFile(self, name, branch_or_hash):

assert name

- assert branch

- self.Git(MakeArgs(["checkout -f", branch, "--", name]))

+ assert branch_or_hash

+ self.Git(MakeArgs(["checkout -f", branch_or_hash, "--", name]))

@Strip

def GitCurrentBranch(self):

« no previous file with comments | « no previous file | tools/push-to-trunk/push_to_trunk.py » ('j') | no next file with comments »