git-strip-new-whitespace

#!/bin/bash

# Strips trailing whitespace from any lines you've introduced. If
# you've staged changes, it strips them from the index (and they stay
# in your working copy).
#
# Why would you want to do this?  Keep your patches clean.  Why not
# just strip all whitespaces from your project?  Well... then you'd
# have a big nasty commit, wouldn't you?  And some code generators
# might rely on the whitespace (like annotate-models).

while [ $(pwd) != "/" ] && [ ! -d ".git" ]; do
  cd ..
done

if [ -f ".git/MERGE_MODE" ]; then
  echo "You are currently in the middle of a merge, and running this would mess you up!"
  exit 1
fi

STAGED_CHANGES="$(git diff --cached --ignore-space-at-eol)"
if [ "$STAGED_CHANGES" != "" ]; then
  echo "Stripping trailing spaces from index"
  git reset 2> /dev/null 1> /dev/null
  if (echo "$STAGED_CHANGES" | git apply --whitespace=fix --cached); then
    echo "Successfully stripped all new whitespaces from the index"
  else
    BLEW_UP_FILE="/tmp/git-strip-new-whitespace-blew-up"
    echo "$STAGED_CHANGES" > "$BLEW_UP_FILE"
    echo "Something went wrong. I wrote the patch for your staged changes to:"
    echo "  $BLEW_UP_FILE"
    echo "Apply them back to your index with:"
    echo "  cat $BLEW_UP_FILE | git apply --cached"
    exit 1
  fi
  exit 0
fi


if [ "$(git diff)" == "" ]; then
  echo "Working directory is clean"
  exit 1
fi
git stash

if (git stash show -p | git apply --whitespace=fix); then
  echo "Successfully stripped all new whitespaces"
  git reset 2> /dev/null 1> /dev/null
  git stash drop 2> /dev/null 1> /dev/null
else
  echo "Something went horribly wrong. Your changes were stashed."
fi
exit 0