From 49adc21d2c47fe079793b4c63b5d222d70e57df6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 29 Jan 2019 13:44:14 +0100
Subject: commitmsg-hook: Simplify filename parsing

Also it now works if you're not in the repo's root dir
---
 extra/prepare-commit-msg | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'extra')

diff --git a/extra/prepare-commit-msg b/extra/prepare-commit-msg
index 53dffb4f..9948d543 100755
--- a/extra/prepare-commit-msg
+++ b/extra/prepare-commit-msg
@@ -3,24 +3,17 @@
 [ -n "$2" ] && exit 0
 [ -e "$1" ] || exit 1
 
-# -F 'to be commited' -F 'vorgemerkte Änderungen'
-inblock=false
 declare -A stuff
 re='core/(modules|rootfs)/([^/]+)/'
 while IFS='' read -r line || [[ -n "$line" ]]; do
-	if $inblock; then
-		[ "$line" = '#' ] && break
-		if [[ $line =~ $re ]]; then
-			if [ -z "${stuff["${BASH_REMATCH[2]}"]}" ]; then
-				stuff["${BASH_REMATCH[2]}"]=1
-			else
-				let stuff["${BASH_REMATCH[2]}"]++
-			fi
+	if [[ $line =~ $re ]]; then
+		if [ -z "${stuff["${BASH_REMATCH[2]}"]}" ]; then
+			stuff["${BASH_REMATCH[2]}"]=1
+		else
+			let stuff["${BASH_REMATCH[2]}"]++
 		fi
-	elif [[ "$line" == *"vorgemerkte Änderungen"* ]] || [[ "$line" == *"to be committed"* ]]; then
-		inblock=true
 	fi
-done < "$1"
+done < <( git status --porcelain | grep -E '^(A|M|D)' )
 
 [ "${#stuff[@]}" -gt 2 ] && exit 0
 [ "${#stuff[@]}" -lt 1 ] && exit 0
-- 
cgit v1.2.3-55-g7522