From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 30 Nov 2017 19:43:08 +0000 (-0200)
Subject: Do not output differences at git-config-{save,restore}
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=073832fae2972ba5507fc0703a28acc2fb9b8216;p=utils-git.git

Do not output differences at git-config-{save,restore}
---

diff --git a/git-config-save b/git-config-save
index d7d12e9..9e742d1 100755
--- a/git-config-save
+++ b/git-config-save
@@ -71,7 +71,8 @@ function git_config_save {
   mkdir -p $BASE/$ID
 
   # Make a backup
-  if [ -f "$BASE/$ID/config" ] && ! diff .git/config $BASE/$ID/config; then
+  if [ -f "$BASE/$ID/config" ] && ! diff .git/config $BASE/$ID/config &> /dev/null; then
+    echo "Differences detected at `pwd`, making a backup..."
     cp $BASE/$ID/config $BASE/$ID/config.$DATE
   fi
 
@@ -104,7 +105,7 @@ function git_config_restore {
   fi
 
   # Make a backup
-  if ! diff .git/config $BASE/$ID/config; then
+  if ! diff .git/config $BASE/$ID/config &> /dev/null; then
     cp .git/config .git/config.$DATE
   else
     echo "Identical configs for `pwd`, skipping"