Explorar o código

Ignore whitespace, so one patch can be applied on Windows and Linux

Signed-off-by: AMZN-stankowi <[email protected]>
AMZN-stankowi %!s(int64=3) %!d(string=hai) anos
pai
achega
add9ef531d
Modificáronse 1 ficheiros con 1 adicións e 0 borrados
  1. 1 0
      Scripts/extras/pull_and_build_from_git.py

+ 1 - 0
Scripts/extras/pull_and_build_from_git.py

@@ -516,6 +516,7 @@ class BuildInfo(object):
 
 
             patch_cmd = ['git',
             patch_cmd = ['git',
                          'apply',
                          'apply',
+                         "--ignore-whitespace",
                          str(patch_file_path.absolute())]
                          str(patch_file_path.absolute())]
 
 
             patch_result = subprocess.run(subp_args(patch_cmd),
             patch_result = subprocess.run(subp_args(patch_cmd),