Apparently this is the correct regex.
This commit is contained in:
parent
f23a5fd90a
commit
3b88df5a42
@ -5,7 +5,7 @@ echo "Rebuilding patch files from current fork state..."
|
|||||||
function cleanupPatches {
|
function cleanupPatches {
|
||||||
cd $1
|
cd $1
|
||||||
for patch in *.patch; do
|
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
|
if [ "$lines" == "0" ] ; then
|
||||||
git reset HEAD $patch >/dev/null
|
git reset HEAD $patch >/dev/null
|
||||||
git checkout -- $patch >/dev/null
|
git checkout -- $patch >/dev/null
|
||||||
|
Loading…
Reference in New Issue
Block a user