Revert "Use core.quotePath=false when git is listing files"
This reverts commit 9219d356885a93d9cbcaf4a2c7fc3f6e29caad49.
Reason for revert: unfortunately this says "core,quotePath" and since it includes recipe changes, we need something that the roller can munch on :(
Original change's description:
> 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>
TBR=maruel@chromium.org,agable@chromium.org
Change-Id: I226388f19024403240a1443eb2b878b9293220e1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 792302
Reviewed-on: https://chromium-review.googlesource.com/821671
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 482c27a..7a634dd 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -813,8 +813,8 @@
] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
((['git', 'rev-parse', '--show-cdup'],), ''),
((['git', 'rev-parse', 'HEAD'],), '12345'),
- ((['git', '-c', 'core.quotePath=false', 'diff',
- '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
+ ((['git', 'diff', '--name-status', '--no-renames', '-r',
+ 'fake_ancestor_sha...', '.'],),
'M\t.gitignore\n'),
((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
((['git', 'log', '--pretty=format:%s%n%n%b',
@@ -1110,8 +1110,8 @@
] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
((['git', 'rev-parse', '--show-cdup'],), ''),
((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
- ((['git', '-c', 'core.quotePath=false', 'diff',
- '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
+ ((['git', 'diff', '--name-status', '--no-renames', '-r',
+ 'fake_ancestor_sha...', '.'],),
'M\tfile1.cpp'),
((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
((['git', 'config', 'branch.feature.rietveldserver'],),
@@ -1228,8 +1228,7 @@
fail_cherry_pick=True,
debug=False)
self.calls += [
- ((['git', '-c', 'core.quotePath=false', 'diff',
- '--name-status', '--diff-filter=U'],),
+ ((['git', 'diff', '--name-status', '--diff-filter=U'],),
'U path/file1\n'
'U file2.cpp\n'),
((['git', 'cherry-pick', '--abort'],), ''),
@@ -1446,8 +1445,8 @@
((['git', 'rev-parse', '--show-cdup'],), ''),
((['git', 'rev-parse', 'HEAD'],), '12345'),
- ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
- '--no-renames', '-r', ancestor_revision + '...', '.'],),
+ ((['git', 'diff', '--name-status', '--no-renames', '-r',
+ ancestor_revision + '...', '.'],),
'M\t.gitignore\n'),
((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
]