From 41b7c5f46532943172c8949d1f9988a03b4a167f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 21 Jan 2013 21:46:26 -0500
Subject: [PATCH] Update rebuildPatches to ignore git version string.

---
 rebuildPatches.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/rebuildPatches.sh b/rebuildPatches.sh
index d9f9399fe5..4f0a843af0 100755
--- a/rebuildPatches.sh
+++ b/rebuildPatches.sh
@@ -5,8 +5,16 @@ 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|.index)" | wc -l)
-        if [ "$lines" == "0" ] ; then
+        gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1)
+        diffs=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
+
+        testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
+        if [ "x$testver" != "x" ]; then
+            diffs=$(echo "$diffs" | head -n -2)
+        fi
+        
+
+        if [ "x$diffs" == "x" ] ; then
             git reset HEAD $patch >/dev/null
             git checkout -- $patch >/dev/null
         fi