From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- translations/git-hooks/commit-msg | 62 +++++++++++++++++++++++++++++++++++++++ translations/git-hooks/post-merge | 12 ++++++++ translations/git-hooks/pre-commit | 54 ++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100755 translations/git-hooks/commit-msg create mode 100755 translations/git-hooks/post-merge create mode 100755 translations/git-hooks/pre-commit (limited to 'translations/git-hooks') diff --git a/translations/git-hooks/commit-msg b/translations/git-hooks/commit-msg new file mode 100755 index 000000000..d51a33035 --- /dev/null +++ b/translations/git-hooks/commit-msg @@ -0,0 +1,62 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by git-commit with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, make this file executable. + +# Uncomment the below to add a Signed-off-by line to the message. +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +abort() { + cp $1 $1.save + cat >&2 <'`" ] ; then + abort "$1" "The commit message looks like ChangeLog, please use the git form." +fi + +# Check for whitespace in front of *'s + +if [ -n "`grep '^[[:space:]]\+\*.*:' $1`" -a -z "`grep '^\*' $1`" ] ; then + abort "$1" "Please don't use whitespace in front of '* file: Description.' entries." +fi + +exit 0 diff --git a/translations/git-hooks/post-merge b/translations/git-hooks/post-merge new file mode 100755 index 000000000..25e62ed8a --- /dev/null +++ b/translations/git-hooks/post-merge @@ -0,0 +1,12 @@ +#!/bin/bash + +# Do not warn if there were no real merge +git rev-parse -q --verify HEAD^2 >/dev/null || exit + +echo +echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +echo "! You probably used 'git pull' instead of 'git pull -r' !" +echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +echo +echo "You can still fix it - please do 'git pull -r' now." +echo diff --git a/translations/git-hooks/pre-commit b/translations/git-hooks/pre-commit new file mode 100755 index 000000000..14ed29c5f --- /dev/null +++ b/translations/git-hooks/pre-commit @@ -0,0 +1,54 @@ +#!/usr/bin/env perl + +# A 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. + +use strict; +#use File::Copy; +#use Cwd; + +$ENV{LC_ALL} = "C"; + +# Do the work :-) + +# Initial commit: diff against an empty tree object +my $against="4b825dc642cb6eb9a060e54bf8d69288fbee4904"; +if ( system( "git rev-parse --verify HEAD >/dev/null 2>&1" ) == 0 ) { + $against="HEAD" +} + +# If you want to allow non-ascii filenames set this variable to true. +my $allownonascii=`git config hooks.allownonascii`; + +# 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 ne "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. + `git diff --cached --name-only --diff-filter=A -z $against | \ + LC_ALL=C tr -d '[ -~]\\0'` ne "" ) +{ + print <