Skip to content

Commit

Permalink
ignore space when applying oss patches
Browse files Browse the repository at this point in the history
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
  • Loading branch information
srikrishnagopu authored and facebook-github-bot committed Dec 8, 2023
1 parent e5110b6 commit e27e0aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/fbcode_builder/getdeps/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def _apply_patchfile(self) -> None:
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:
Expand Down

0 comments on commit e27e0aa

Please sign in to comment.