Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed Jul 29, 2012
2 parents f457ece + 52eed92 commit eac8bc8
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions scripts/prepare-commit.sh
Expand Up @@ -20,15 +20,7 @@ set -e
if [ -d .svn ]; then
MODIFIED=$(svn status | sed -ne "s/^[MA] *//p")
elif [ -d .git ]; then
case $OSTYPE in
darwin*)
MODIFIED=$(git status | sed -Ene "s/^# (modified|new file): *//p" | sort -u)
;;
*)
MODIFIED=$(git status | sed -rne "s/^# (modified|new file): *//p" | sort -u)
;;
esac

MODIFIED=$(git status --porcelain| sed -ne "s/^ *[MA] *//p" | sort -u)
else
echo No working copy
exit 1
Expand Down

0 comments on commit eac8bc8

Please sign in to comment.