commit 9219d356885a93d9cbcaf4a2c7fc3f6e29caad49
author Aaron Gable <agable@chromium.org> Thu Dec 07 13:39:11 2017 -0800
committer Commit Bot <commit-bot@chromium.org> Mon Dec 11 20:02:00 2017 +0000
tree f1c6774be2e2117de0ac3e002c8979e3080642fd
parent e8856eea42cf284071511107e818ce9980b30636

Use core.quotePath=false when git is listing files

This prevents git from putting quotes around some file names
(those that have astral-plane characters) and not around others.

R=maruel

Bug: 792302
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Change-Id: I3b6a6b36c4720116de811b40177b59aa25c263db
Reviewed-on: https://chromium-review.googlesource.com/815454
Commit-Queue: Aaron Gable <agable@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 171e2fd..123852f 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -5359,7 +5359,8 @@
       print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
             'the following files have merge conflicts:' %
             (branch, parent_hash))
-      print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
+      print(RunGit(['-c', 'core.quotePath=false', 'diff',
+                    '--name-status', '--diff-filter=U']).strip())
       print('Please rebase your patch and try again.')
       RunGitWithCode(['cherry-pick', '--abort'])
       break