Bump pypa/cibuildwheel from 2.10.2 to 2.11.2 (#3367)

[etc/vim.git] / scripts / migrate-black.py

diff --git a/scripts/migrate-black.py b/scripts/migrate-black.py
index 5a6bc424824260a53216dbfa3256486f726b6efd..ff52939460ccc26e7f851720acf75600cea71641 100755 (executable)
--- a/scripts/migrate-black.py
+++ b/scripts/migrate-black.py
@@ -5,7 +5,7 @@
 import logging
 import os
 import sys
 import logging
 import os
 import sys

-from subprocess import check_output, run, Popen, PIPE
+from subprocess import PIPE, Popen, check_output, run

 
 
 def git(*args: str) -> str:
 
 
 def git(*args: str) -> str:


@@ -16,7 +16,7 @@ def blackify(base_branch: str, black_command: str, logger: logging.Logger) -> in
     current_branch = git("branch", "--show-current")
 
     if not current_branch or base_branch == current_branch:
     current_branch = git("branch", "--show-current")
 
     if not current_branch or base_branch == current_branch:

-        logger.error("You need to check out a feature brach to work on")
+        logger.error("You need to check out a feature branch to work on")

         return 1
 
     if not os.path.exists(".git"):
         return 1
 
     if not os.path.exists(".git"):


@@ -49,6 +49,7 @@ def blackify(base_branch: str, black_command: str, logger: logging.Logger) -> in
             [
                 "git",
                 "diff",
             [
                 "git",
                 "diff",

+                "--binary",

                 "--find-copies",
                 "%s-black..%s-black" % (last_commit, commit),
             ],
                 "--find-copies",
                 "%s-black..%s-black" % (last_commit, commit),
             ],