From 26c7b148f48b47a8ad0c728b45b7e1f67fdc8298 Mon Sep 17 00:00:00 2001 From: Robotia Date: Tue, 19 Jan 2016 11:10:25 -0500 Subject: [PATCH] Bad idea to ignore whitespace... --- makepatch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makepatch.sh b/makepatch.sh index ba9baf8..c4fb586 100755 --- a/makepatch.sh +++ b/makepatch.sh @@ -15,7 +15,7 @@ then CLEAN=`find eclipse/Clean/src/main/java | grep $FILE` CAULD=`find eclipse/cauldron/src/main/java | grep $FILE` PATCH=`find patches/ | grep -i $FILE` - git diff --no-index --text -w $CLEAN $CAULD + git diff --no-index --no-prefix --text $CLEAN $CAULD echo "Diff patch of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} above." elif [ $1 == "make" ] then @@ -24,7 +24,7 @@ then CLEAN=`find eclipse/Clean/src/main/java | grep $FILE` CAULD=`find eclipse/cauldron/src/main/java | grep $FILE` PATCH=`find patches/ | grep -i $FILE` - git diff --no-index --text -w $CLEAN $CAULD > $PATCH + git diff --no-prefix --no-index --text $CLEAN $CAULD > $PATCH java makepatch $PATCH echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}" else @@ -33,7 +33,7 @@ else CLEAN=`find eclipse/Clean/src/main/java | grep $FILE` CAULD=`find eclipse/cauldron/src/main/java | grep $FILE` PATCH=`find patches/ | grep -i $FILE` - git diff --no-prefix --no-index --text -w $CLEAN $CAULD > $PATCH + git diff --no-index $CLEAN $CAULD > $PATCH java makepatch $PATCH echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}" fi