Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2653)

Unified Diff: Tools/Scripts/webkitpy/tool/commands/rebaseline.py

Issue 1235353002: Fix resolution of local branch name in scm and rebaseline tools. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/tool/commands/rebaseline.py
diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
index 9fc847f51f9b4a4aeb15c4c663e8796eaafa3b8b..d049c66eedc5f5a564661023e66bd91b934fb326 100644
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
@@ -843,7 +843,7 @@ class AutoRebaseline(AbstractParallelRebaselineCommand):
# Save the current branch name and checkout a clean branch for the patch.
old_branch_name = tool.executive.run_command(
- ["git", "rev-parse", "--symbolic-full-name", "HEAD"])
+ ["git", "rev-parse", "--symbolic-full-name", "HEAD"]).strip()
Xianzhu 2015/07/15 21:16:58 If scm.current_branch() had problem we should fix
joelo 2015/07/16 21:48:48 Done.
if old_branch_name == "HEAD":
# If HEAD is detached use commit SHA instead.
old_branch_name = tool.executive.run_command(["git", "rev-parse", "HEAD"])
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698