From 2e339cc792404f7ed75985fff34d635269d6331d Mon Sep 17 00:00:00 2001
From: tiddlygit-test <linonetwo012@gmail.com>
Date: Thu, 6 May 2021 00:52:56 +0800
Subject: [PATCH] feat: upgrade git-sync

---
 package-lock.json             | 6 +++---
 package.json                  | 2 +-
 src/services/git/gitWorker.ts | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5e03787c..98b8b7ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12114,9 +12114,9 @@
       }
     },
     "git-sync-js": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/git-sync-js/-/git-sync-js-0.1.6.tgz",
-      "integrity": "sha512-J1tB1BHLqOZmhWIlIJ0xHthhlAxgbkdZ9V8CzNOmSxsvikF7//tH2AFjlpnJyCG23DC2aReETAuDvzTizhCZZQ==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/git-sync-js/-/git-sync-js-0.1.7.tgz",
+      "integrity": "sha512-YyyEA68c+O78WFbHSLBwQCJuad9T143B3n3+Z14uh318FGqll3qmNhhJ/hqrHom1Mww6XjK5kg3ofORxsLAoAg==",
       "requires": {
         "dugite": "^1.103.0",
         "fs-extra": "^9.1.0",
diff --git a/package.json b/package.json
index d52413dd..d99aa319 100755
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "electron-window-state": "5.0.3",
     "errio": "1.2.2",
     "fs-extra": "9.1.0",
-    "git-sync-js": "^0.1.6",
+    "git-sync-js": "^0.1.7",
     "i18next": "20.2.2",
     "i18next-electron-fs-backend": "1.3.6",
     "i18next-fs-backend": "1.1.1",
diff --git a/src/services/git/gitWorker.ts b/src/services/git/gitWorker.ts
index fb7a7d37..1308c4fd 100644
--- a/src/services/git/gitWorker.ts
+++ b/src/services/git/gitWorker.ts
@@ -12,7 +12,8 @@ function initWikiGit(wikiFolderPath: string, isSyncedWiki?: boolean, remoteUrl?:
       dir: wikiFolderPath,
       remoteUrl,
       syncImmediately: isSyncedWiki,
-      userInfo: { ...defaultGitInfo, ...userInfo },
+      userInfo,
+      defaultGitInfo,
       logger: {
         log: (message: string, context: ILoggerContext): unknown =>
           observer.next({ message, level: 'log', meta: { callerFunction: 'initWikiGit', ...context } }),
@@ -40,7 +41,8 @@ function commitAndSyncWiki(wikiFolderPath: string, remoteUrl: string, userInfo:
     void commitAndSync({
       dir: wikiFolderPath,
       remoteUrl,
-      userInfo: { ...defaultGitInfo, ...userInfo },
+      userInfo,
+      defaultGitInfo,
       logger: {
         log: (message: string, context: ILoggerContext): unknown =>
           observer.next({ message, level: 'log', meta: { callerFunction: 'commitAndSync', ...context } }),
@@ -62,7 +64,8 @@ function cloneWiki(remoteUrl: string, repoFolderPath: string, userInfo: IGitUser
     void clone({
       dir: repoFolderPath,
       remoteUrl,
-      userInfo: { ...defaultGitInfo, ...userInfo },
+      userInfo,
+      defaultGitInfo,
       logger: {
         log: (message: string, context: ILoggerContext): unknown => observer.next({ message, level: 'log', meta: { callerFunction: 'clone', ...context } }),
         warn: (message: string, context: ILoggerContext): unknown => observer.next({ message, level: 'warn', meta: { callerFunction: 'clone', ...context } }),