首次提交时，预提交挂钩中的git stash失败

问题描述 投票：2回答：2

我正在使用一个预提交钩子，它使用YUI Compressor来缩小已经提交的任何CSS和JavaScript文件。文件缩小后，缩小版本会自动进行提交。我已经读过，自动将机器生成的文件添加到提交中通常不是一个好主意，但我认为在这种情况下它没关系。这就是它的样子：

git status的输出：

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   _site-wide.css
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   modified:   _subpage.css
#

git commit -m "Updated site-wide styling"的输出：

1 CSS file was minified and added to the Git repository
0 JavaScript files were minified and added to the Git repository
[master 41f1815] Updated site-wide styling
 2 files changed, 2 insertions(+), 2 deletions(-)

这里发生的事情是使用YUI Compressor缩小_site-wide.css的预提交钩子，将结果输出到site-wide.css（没有前导下划线）。然后它上演site-wide.css进行提交。预提交钩子跳过_subpage.css，因为虽然它已被修改，但它没有为提交暂存。

由于磁盘上的CSS和JavaScript文件可能与提交的CSS和JavaScript文件不同，我在缩小文件之前运行git stash -q --keep-index，然后运行git stash pop -q。这个预提交钩子在已经有提交的存储库上工作正常，但是如果我在第一次提交之前将预提交钩子放到位，我得到这个：

git status的输出：

# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#   new file:   _site-wide.css
#   new file:   _subpage.css
#

git commit -m "Initial commit"的输出：

fatal: bad revision 'HEAD'
fatal: bad revision 'HEAD'
fatal: Needed a single revision
You do not have the initial commit yet
2 CSS files were minified and added to the Git repository
0 JavaScript files were minified and added to the Git repository
No stash found.

git status的输出：

# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#   new file:   _site-wide.css
#   new file:   _subpage.css
#   new file:   site-wide.css
#   new file:   subpage.css
#

我现在将粘贴预提交钩子的代码。请记住，为了灵活，我编写了这个脚本，以便它可以在任何CakePHP项目中运行，而不仅仅是具有Git存储库的项目。我也写了它，以便你可以强制它缩小所有的CSS和JavaScript文件，而不仅仅是为提交而进行的文件。这是通过运行.git/hooks/pre-commit force来完成的。这是代码：

#!/bin/bash

css_files_to_ignore=(
    #"_do_not_minify.css"
)

js_files_to_ignore=(
    #"_do_not_minify.js"
)

if git rev-parse --git-dir > /dev/null 2>&1; then
    git_repository=true
    base_folder="$(git rev-parse --show-toplevel)/app/webroot"

    if [ "$1" == "force" ]; then
        process_unstaged_files=true
    else
        process_unstaged_files=false
    fi
else
    git_repository=false
    base_folder="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/webroot"
fi

if [ -f /Applications/yuicompressor.jar ]; then
    # Mac

    yuicompressor_path=/Applications/yuicompressor.jar
else
    # Linux

    yuicompressor_path=$(command -v yui-compressor)
fi

function process_assets()
{
    extension=$1
    files_minified=0

    for infile in $(echo "$base_folder/$extension/*.$extension")
    do
        # Only process files.

        [[ -f $infile ]] || continue

        filename=${infile##*/}

        # If the filename starts with an underscore, that means that the file is
        # eligible for minification.

        [[ ${filename:0:1} == "_" ]] || continue

        ignore_this_file=false

        files_to_ignore=$extension"_files_to_ignore"

        for i in $(eval echo \${$files_to_ignore[@]})
        do
            if [[ $i == $filename ]]; then
                ignore_this_file=true
                break
            fi
        done

        if [ $git_repository == true ] && [ $process_unstaged_files == false ] && git diff --quiet --cached $infile; then
            # This file is NOT staged for commit.

            ignore_this_file=true
        fi

        if [ $ignore_this_file == false ]; then
            minified_file="$base_folder/$extension/${filename:1}"

            if [ ! -f "$minified_file" ] || test $infile -nt $minified_file; then
                $yuicompressor_command "$infile" -o "$minified_file"

                if [ $git_repository == true ] && [ $process_unstaged_files == false ]; then
                    git add "$minified_file"
                fi

                ((files_minified++))
            fi
        fi
    done

    # Output a summary of what was done.

    if [ $extension == "css" ]; then
        file_type="CSS"
    else
        file_type="JavaScript"
    fi

    echo -n "$files_minified $file_type file"

    if [ $files_minified -eq 1 ]; then
        echo -n " was"
    else
        echo -n "s were"
    fi

    echo -n " minified"

    if [ $git_repository == true ] && [ $process_unstaged_files == false ]; then
        echo " and added to the Git repository"
    else
        echo
    fi
}

if [ -f "$yuicompressor_path" ]; then
    if [ ${yuicompressor_path: -4} == ".jar" ]; then
        yuicompressor_command="java -jar $yuicompressor_path"
    else
        yuicompressor_command=$yuicompressor_path
    fi

    if [ $git_repository == true ] && [ $process_unstaged_files == false ] && ! git diff --quiet --cached; then
        # The staging area is what should be processed rather than what is currently
        # on disk.

        git stash -q --keep-index

        stashed=true
    else
        stashed=false
    fi

    process_assets css
    process_assets js

    if [ $stashed == true ]; then
        git stash pop -q
    fi
else
    echo "YUI Compressor was not found. Aborting."
    exit 1
fi

我怎样才能做到这一点？任何帮助，将不胜感激。

git githooks pre-commit-hook git-stash
2个回答
1
投票

我得出结论，没有解决方案，因为当没有HEAD时，一些Git命令根本不起作用。此外，在考虑了一些之后，我认为这至少对我来说是一种边缘情况，因为我的第一次提交通常是基本的，例如我使用的框架文件。所以我可以在第一次提交后实现钩子。

我很欣赏Hassek的时间以及其他阅读此内容的人的时间。谢谢！

0
投票

随着Git 2.22（2019年第二季度，7年后），有一个与git stash as rewritten in C。

见commit 1ac528c的Paul-Sebastian Ungureanu (weekly-digest[bot])（2019年2月25日）。

stash：让push -q安静

此提交的行为发生了变化。 当没有初始提交时，stash的shell版本仍会显示一条消息。 如果指定了push或--quiet，则此提交使-q不显示任何消息。

所以你不应该看到You do not have the initial commit yet的“git stash -q <command>”，从Git 2.22的新重写的stash命令开始。

最新问题
© www.soinside.com 2019 - 2024. All rights reserved.