Question

我有一个git预提交钩子，它在触摸python文件上运行autopep8。我的问题在于： # If there are whitespace errors, print s the offending file names and fail s . #!/bin/bash # # An example hook script to verify what is about to be committed. # Called by "git commit" with no arguments. The hook should # exit with non-zero status after issuing an appropriate message if # it wants to stop the commit. # # To enable this hook, rename this file to "pre-commit". if git rev-parse --verify HEAD >/dev/null 2>&1 then against=HEAD else # Initial commit: diff against an empty tree object against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 fi # If you want to allow non-ascii filenames set this variable to true. allownonascii=$(git config hooks.allownonascii || echo false) # Redirect output to stderr. exec 1>&2 # Cross platform projects tend to avoid non-ascii filenames; prevent # them from being added to the repository. We exploit the fact that the # printable range starts at the space character and ends with tilde. if [ "$allownonascii" != "true" ] && # Note that the use of brackets around a tr range is ok here, (it's # even required, for portability to Solaris 10's /usr/bin/tr), since # the square bracket bytes happen to fall in the designated range. test $(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 then echo "Error: Attempt to add a non-ascii file name." echo echo "This can cause problems if you want to work" echo "with people on other platforms." echo echo "To be portable it is advisable to rename the file ..." echo echo "If you know what you are doing you can disable this" echo "check using:" echo echo " git config hooks.allownonascii true" echo exit 1 fi # If there are whitespace errors, print the offending file names and fail. git diff-index --check --cached $against -- touched_python_files=`git diff --cached --name-only |egrep '\.py$' || true` if [ -n "$touched_python_files" ]; then autopep8 \ --ignore=E26 \ --in-place \ --jobs=0 \ --max-line-length=150 \ $touched_python_files fi（见下文。）

问题：

如何重新添加和重新提交我目前必须手动修复的文件？

谢谢！

{{1}}

Answer 1

这是@ steven脚本的修改版本。

如果autopep8修改了文件，则提交被停止（因此您可以使用git add -p提交部分差异，而无需担心）。如果autopep8由于某种原因失败，也会停止提交。

不幸的是，如果autopep8修改了某些内容，则无法从退出状态或输出中判断，因此必须运行两次（一次用于差异，一次用于编辑）。

#!/bin/sh

status=0
touched_python_files=$(git diff --cached --name-only | grep -E '\.py$')
if [ -n "$touched_python_files" ]; then
    options="\
      --ignore=E26 \
      --max-line-length=150 \
    "

    output=$(autopep8 -d $options "${touched_python_files[@]}")
    status=$?

    if [ -n "$output" ]; then
        autopep8 -i -j 0 $options "${touched_python_files[@]}"
        echo ">>> autopep8 edited some files <<<"
        exit 1
    fi
fi

exit $status

git pre-commit中的autopep8 - 如何自动重新发送？

1 个答案: