From 3b88df5a425d342d833e9dd696a6056013b3614e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 19 Jan 2013 19:24:36 +1100 Subject: [PATCH] Apparently this is the correct regex. --- rebuildPatches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebuildPatches.sh b/rebuildPatches.sh index 1d90529d1..8b74051c8 100755 --- a/rebuildPatches.sh +++ b/rebuildPatches.sh @@ -5,7 +5,7 @@ echo "Rebuilding patch files from current fork state..." function cleanupPatches { cd $1 for patch in *.patch; do - lines=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|--- a|+++ b)" | wc -l) + lines=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)" | wc -l) if [ "$lines" == "0" ] ; then git reset HEAD $patch >/dev/null git checkout -- $patch >/dev/null