
When we install Git we also install a set of default templates that both git-init(1) and git-clone(1) populate into our build directories. The way the pristine templates are laid out in our source directory is somewhat weird though: instead of reconstructing the actual directory hierarchy in "templates/", we represent directory separators with "--". The only reason I could come up with for why we have this is the "branches/" directory, which is supposed to be empty when installing it. And as Git famously doesn't store empty directories at all we have to work around this limitation. Now the thing is that the "branches/" directory is a leftover to how branches used to be stored in the dark ages. gitrepository-layout(5) lists this directory as "slightly deprecated", which I would claim is a strong understatement. I have never encountered anybody using it today and would be surprised if it even works as expected. So having the "--" hack in place for an item that is basically unused, unmaintained and deprecated doesn't only feel unreasonable, but installing that entry by default may also cause confusion for users that do not know what this is supposed to be in the first place. Remove this directory from our templates and, now that we do not require the workaround anymore, restructure the templates to form a proper hierarchy. This makes it way easier for build systems to install these templates into place. We should likely think about removing support for "branch/" altogether, but that is outside of the scope of this patch series. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
50 lines
1.6 KiB
Bash
Executable File
50 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# 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=$(git hash-object -t tree /dev/null)
|
|
fi
|
|
|
|
# If you want to allow non-ASCII filenames set this variable to true.
|
|
allownonascii=$(git config --type=bool hooks.allownonascii)
|
|
|
|
# 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-index --cached --name-only --diff-filter=A -z $against |
|
|
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
|
then
|
|
cat <<\EOF
|
|
Error: Attempt to add a non-ASCII file name.
|
|
|
|
This can cause problems if you want to work with people on other platforms.
|
|
|
|
To be portable it is advisable to rename the file.
|
|
|
|
If you know what you are doing you can disable this check using:
|
|
|
|
git config hooks.allownonascii true
|
|
EOF
|
|
exit 1
|
|
fi
|
|
|
|
# If there are whitespace errors, print the offending file names and fail.
|
|
exec git diff-index --check --cached $against --
|