-if [ "x$1" == "xdoit" ]; then
- if git status --porcelain|grep '^ M'|grep -q $ORG_GREP; then
- git commit -m'update org files' $(mr --no-recurse status |grep '^ M'|grep $ORG_GREP|sed 's/^ M//g');
- if [ "$2" != "commit" ]; then
- git push;
- fi;
- fi;
+COMMIT_MESSAGE="${1:-update org files}"
+
+if [ "x$UPDATE_ORG_REALLY_DO_IT" == "xyesdoit" ]; then
+ if git status --porcelain -z | grep -z '^ M' | grep -zq $ORG_GREP; then
+ git status --porcelain -z | grep -z '^ M' | grep -z $ORG_GREP | \
+ sed -z 's/^ M[[:space:]]*//g' | \
+ xargs -0 git commit -m"$COMMIT_MESSAGE"
+ git push;
+ fi;
+ git pull;