From c809e0a387d4097e7d9f81eb8c4e5f6235e0f372 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 14 Feb 2014 12:26:33 -0800
Subject: [PATCH] use grep -s and other -z options

---
 update_org_files | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/update_org_files b/update_org_files
index b50ff08..47d33bf 100755
--- a/update_org_files
+++ b/update_org_files
@@ -3,15 +3,13 @@
 ORG_GREP='-e .org$ -e .org_archive$ -e .org_done$'
 
 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;
+    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//g' | \
+            xargs -0 git commit -m'update org files'
+        git push;
     fi; 
 else
     emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
     mr -d ~ -j5 run update_org_files doit;
 fi;
-
-
-- 
2.39.2