ed060aa0a3
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>
54 lines
1.3 KiB
Bash
Executable File
54 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# An example hook script to verify what is about to be pushed. Called by "git
|
|
# push" after it has checked the remote status, but before anything has been
|
|
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
|
#
|
|
# This hook is called with the following parameters:
|
|
#
|
|
# $1 -- Name of the remote to which the push is being done
|
|
# $2 -- URL to which the push is being done
|
|
#
|
|
# If pushing without using a named remote those arguments will be equal.
|
|
#
|
|
# Information about the commits which are being pushed is supplied as lines to
|
|
# the standard input in the form:
|
|
#
|
|
# <local ref> <local oid> <remote ref> <remote oid>
|
|
#
|
|
# This sample shows how to prevent push of commits where the log message starts
|
|
# with "WIP" (work in progress).
|
|
|
|
remote="$1"
|
|
url="$2"
|
|
|
|
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
|
|
|
while read local_ref local_oid remote_ref remote_oid
|
|
do
|
|
if test "$local_oid" = "$zero"
|
|
then
|
|
# Handle delete
|
|
:
|
|
else
|
|
if test "$remote_oid" = "$zero"
|
|
then
|
|
# New branch, examine all commits
|
|
range="$local_oid"
|
|
else
|
|
# Update to existing branch, examine new commits
|
|
range="$remote_oid..$local_oid"
|
|
fi
|
|
|
|
# Check for WIP commit
|
|
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
|
|
if test -n "$commit"
|
|
then
|
|
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
|
exit 1
|
|
fi
|
|
fi
|
|
done
|
|
|
|
exit 0
|