From: danix <danix@danix.xyz>
Date: Tue, 18 Apr 2023 07:11:37 +0000 (+0200)
Subject: if PLAIN option is enabled, git pull doesn't emit output.
X-Git-Tag: v0.4~1
X-Git-Url: https://git.danix.xyz/?a=commitdiff_plain;h=cf9f797b245fef7b4ca2694c936520bce337032d;p=bash-notes.git

if PLAIN option is enabled, git pull doesn't emit output.
---

diff --git a/SOURCE/CORE/git.sh b/SOURCE/CORE/git.sh
index ff674df..3ddec6c 100644
--- a/SOURCE/CORE/git.sh
+++ b/SOURCE/CORE/git.sh
@@ -26,7 +26,7 @@ gitsync() {
             $JQ --arg n "$NOWSYNC" '.git["lastpull"] = $n' "$DB" > $TMPDB
             mv $TMPDB $DB
             cd $BASEDIR
-            $GIT pull
+            [ $PLAIN == false ] && $GIT pull || $GIT pull -q
         else
             # LASTSYNC is the last time we synced to the remote, or 0 if it's the first time.
             LASTSYNC=$($JQ -r '.git["lastpull"] // 0' "$DB")
@@ -36,7 +36,7 @@ gitsync() {
                 $JQ --arg n "$NOWSYNC" '.git["lastpull"] = $n' "$DB" > $TMPDB
                 mv $TMPDB $DB
                 cd $BASEDIR
-                $GIT pull
+                [ $PLAIN == false ] && $GIT pull || $GIT pull -q
             else
                 # Last synced less than $GITSYNCDELAY seconds ago. We shall wait
                 [ $PLAIN == false ] && echo "Last synced less than $GITSYNCDELAY seconds ago. We shall wait"
diff --git a/notes.sh b/notes.sh
index 687fefe..089daca 100755
--- a/notes.sh
+++ b/notes.sh
@@ -268,7 +268,7 @@ gitsync() {
             $JQ --arg n "$NOWSYNC" '.git["lastpull"] = $n' "$DB" > $TMPDB
             mv $TMPDB $DB
             cd $BASEDIR
-            $GIT pull
+            [ $PLAIN == false ] && $GIT pull || $GIT pull -q
         else
             # LASTSYNC is the last time we synced to the remote, or 0 if it's the first time.
             LASTSYNC=$($JQ -r '.git["lastpull"] // 0' "$DB")
@@ -278,7 +278,7 @@ gitsync() {
                 $JQ --arg n "$NOWSYNC" '.git["lastpull"] = $n' "$DB" > $TMPDB
                 mv $TMPDB $DB
                 cd $BASEDIR
-                $GIT pull
+                [ $PLAIN == false ] && $GIT pull || $GIT pull -q
             else
                 # Last synced less than $GITSYNCDELAY seconds ago. We shall wait
                 [ $PLAIN == false ] && echo "Last synced less than $GITSYNCDELAY seconds ago. We shall wait"