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 456156f7094983cae4b1d42d31ed08861e44c63b..a1e6256df29db1b26e7ea5676f584c72700e39d5 100644 |
--- a/tools/push-to-trunk/git_recipes.py |
+++ b/tools/push-to-trunk/git_recipes.py |
@@ -295,8 +295,11 @@ class GitRecipesMixin(object): |
@Strip |
def GitSVNFindGitHash(self, revision, branch="", **kwargs): |
assert revision |
- return self.Git( |
- MakeArgs(["svn find-rev", "r%s" % revision, branch]), **kwargs) |
+ args = MakeArgs(["svn find-rev", "r%s" % revision, branch]) |
+ |
+ # Pick the last line if multiple lines are available. The first lines might |
+ # print information about rebuilding the svn-git mapping. |
+ return self.Git(args, **kwargs).splitlines()[-1] |
@Strip |
def GitSVNFindSVNRev(self, git_hash, branch="", **kwargs): |