From 6c8606712ec52c0367f8590371a186fed5918a95 Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 8 Dec 2023 11:28:28 -0800 Subject: [PATCH] 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 --- build/fbcode_builder/getdeps/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index e85b11072..0aa937af6 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -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: