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>
43 lines
1.5 KiB
Bash
Executable File
43 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# An example hook script to prepare the commit log message.
|
|
# Called by "git commit" with the name of the file that has the
|
|
# commit message, followed by the description of the commit
|
|
# message's source. The hook's purpose is to edit the commit
|
|
# message file. If the hook fails with a non-zero status,
|
|
# the commit is aborted.
|
|
#
|
|
# To enable this hook, rename this file to "prepare-commit-msg".
|
|
|
|
# This hook includes three examples. The first one removes the
|
|
# "# Please enter the commit message..." help message.
|
|
#
|
|
# The second includes the output of "git diff --name-status -r"
|
|
# into the message, just before the "git status" output. It is
|
|
# commented because it doesn't cope with --amend or with squashed
|
|
# commits.
|
|
#
|
|
# The third example adds a Signed-off-by line to the message, that can
|
|
# still be edited. This is rarely a good idea.
|
|
|
|
COMMIT_MSG_FILE=$1
|
|
COMMIT_SOURCE=$2
|
|
SHA1=$3
|
|
|
|
@PERL_PATH@ -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
|
|
|
|
# case "$COMMIT_SOURCE,$SHA1" in
|
|
# ,|template,)
|
|
# @PERL_PATH@ -i.bak -pe '
|
|
# print "\n" . `git diff --cached --name-status -r`
|
|
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
|
|
# *) ;;
|
|
# esac
|
|
|
|
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
|
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
|
|
# if test -z "$COMMIT_SOURCE"
|
|
# then
|
|
# @PERL_PATH@ -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
|
|
# fi
|