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 4358258d3fc730ed0bc5edaa135fe9006fb8eade..7d9c4026e217a46e9461e6a41b15ef237e6f7252 100644 |
--- a/tools/push-to-trunk/git_recipes.py |
+++ b/tools/push-to-trunk/git_recipes.py |
@@ -63,9 +63,10 @@ class GitRecipesMixin(object): |
assert name |
self.Git(MakeArgs(["checkout -f", name])) |
- def GitCheckoutFile(self, name): |
+ def GitCheckoutFile(self, name, branch): |
assert name |
- self.Git(MakeArgs(["checkout -f --", name])) |
+ assert branch |
+ self.Git(MakeArgs(["checkout -f", branch, "--", name])) |
@Strip |
def GitCurrentBranch(self): |