From 30f457a9a043c042dc3c7b219aeae584999495d1 Mon Sep 17 00:00:00 2001
From: mrjk <mrjk.78@gmail.com>
Date: Tue, 27 Feb 2018 02:51:22 -0500
Subject: [PATCH] Fix: git sync merge

---
 lib/idmgr_mod_git.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/idmgr_mod_git.sh b/lib/idmgr_mod_git.sh
index 8c4e2e6..3411f11 100644
--- a/lib/idmgr_mod_git.sh
+++ b/lib/idmgr_mod_git.sh
@@ -205,6 +205,7 @@ idm_git__repo_check ()
 
     # Test ssh conenction
     lib_log INFO "Testing: $name $user on $host in $path ..."
+    set -x
     ssh_script="$(idm_git_ssh_scan_script $id $path)"
     path=$(ssh -l $user $host "$ssh_script" < /dev/null || true )
 
@@ -246,6 +247,8 @@ idm_git_ssh_scan_script ()
     echo "$path"
   elif [ -d \${XDG_CACHE_HOME:-~/.cache}/$path/refs ]; then
     echo \${XDG_CACHE_HOME:-~/.cache}/$path
+  elif [ -d \${XDG_CACHE_HOME:-~/.cache}/idmgr/git/$id/local.git/refs ]; then
+    echo \${XDG_CACHE_HOME:-~/.cache}/idmgr/git/$id/local.git
   elif [ -d \${XDG_CACHE_HOME:-~/.local/cache}/idmgr/git/$id/local.git/refs ]; then
     echo \${XDG_CACHE_HOME:-~/.local/cache}/idmgr/git/$id/local.git
   fi
@@ -270,8 +273,11 @@ idm_git__repo_sync ()
   #idm_git__repo_check $id
 
   # Sync
-  lib_git id fetch --all
-  # If i well undertood, never do a push !
+  for r in $( lib_git id remote | grep -v tomb ); do
+    [ ! -z "$r" ] || continue
+    lib_git id fetch $r master
+    # If i well undertood, never do a push !
+  done
 
 }