mirror of
https://github.com/facebook/sapling.git
synced 2024-10-04 22:07:44 +03:00
ignore space when applying oss patches
Summary: As titled, ignore space when applying oss patches. Certain source code will use tabs instead of spaces (for eg, iproute2) and the patch fails when applying; Reviewed By: shri-khare Differential Revision: D51971636 fbshipit-source-id: 094983d142a039428da4cd9f980d6f30ca3e50fa
This commit is contained in:
parent
f12af71ae6
commit
2fa1004598
@ -113,7 +113,7 @@ class BuilderBase(object):
|
||||
patchfile = os.path.join(
|
||||
self.build_opts.fbcode_builder_dir, "patches", self.patchfile
|
||||
)
|
||||
patchcmd = ["git", "apply"]
|
||||
patchcmd = ["git", "apply", "--ignore-space-change"]
|
||||
if self.patchfile_opts:
|
||||
patchcmd.append(self.patchfile_opts)
|
||||
try:
|
||||
|
Loading…
Reference in New Issue
Block a user