[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/common.sh: the change classes passed to --diff-filter must be concatenated directly.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository maintenancescripts.

commit 47c0a5aaeecc935d1318f7f537deb56ba0fce896
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 3 16:16:28 2017 +0100

    git/hooks/common.sh: the change classes passed to --diff-filter must be concatenated directly.
    
    The documentation is unclear in this respect, the pipes are only
    included for human consumption.
---
 git/hooks/common.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/git/hooks/common.sh b/git/hooks/common.sh
index ca325db..71aeb77 100755
--- a/git/hooks/common.sh
+++ b/git/hooks/common.sh
@@ -80,7 +80,7 @@ function check_log_message () {
 }
 
 function check_trailing_whitespace () {
-  git diff-tree --diff-filter="A|C|M|R" --name-only -r "${REVISION}" | tail -n +2 | egrep -v '/$|\.diff$|\.patch$' | egrep "${@}" | while read file; do
+  git diff-tree --diff-filter="ACMR" --name-only -r "${REVISION}" | tail -n +2 | egrep -v '/$|\.diff$|\.patch$' | egrep "${@}" | while read file; do
     if is_text_file "${REVISION}" "${file}" 2> /dev/null ; then
       if git cat-file -p "${REVISION}:${file}" | grep -e '[  ]$' > /dev/null ; then
         echowarn "In ${REVISION}:"
@@ -91,7 +91,7 @@ function check_trailing_whitespace () {
 }
 
 function check_ending_newline () {
-  git diff-tree --diff-filter="A|C|M|R" --name-only -r "${REVISION}" | tail -n +2 | egrep -v '/$|\.diff$|\.patch$' | egrep "${@}" | while read file; do
+  git diff-tree --diff-filter="ACMR" --name-only -r "${REVISION}" | tail -n +2 | egrep -v '/$|\.diff$|\.patch$' | egrep "${@}" | while read file; do
     if is_text_file "${REVISION}" "${file}" 2> /dev/null ; then
       if [ "$(git cat-file -p "${REVISION}:${file}" | tail -c1 | wc -l)" = "0" ]; then
         echowarn "In ${REVISION}:"
@@ -102,7 +102,7 @@ function check_ending_newline () {
 }
 
 function check_tabs () {
-  git diff-tree --diff-filter="A|C|M|R" --name-only -r "${REVISION}" | tail -n +2 | egrep -v 'Makefile.*|common.mak|subdir.mak|clean-diff|\.diff|\.patch' | egrep "${@}" | while read file; do
+  git diff-tree --diff-filter="ACMR" --name-only -r "${REVISION}" | tail -n +2 | egrep -v 'Makefile.*|common.mak|subdir.mak|clean-diff|\.diff|\.patch' | egrep "${@}" | while read file; do
     if is_text_file "${REVISION}" "${file}" 2> /dev/null ; then
       if git cat-file -p "${REVISION}:${file}" | grep -P '\t' > /dev/null; then
         echowarn "In ${REVISION}:"
@@ -113,7 +113,7 @@ function check_tabs () {
 }
 
 function check_dos_linebreaks () {
-  git diff-tree --diff-filter="A|C|M|R" --name-only -r "${REVISION}" | tail -n +2 | egrep "${@}" | while read file; do
+  git diff-tree --diff-filter="ACMR" --name-only -r "${REVISION}" | tail -n +2 | egrep "${@}" | while read file; do
     if is_text_file "${REVISION}" "${file}" 2> /dev/null ; then
       if  git cat-file -p "${REVISION}:${file}" | grep -q '^M$' 2> /dev/null; then
         echowarn "In ${REVISION}:"

--
Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git