feat(sync): Synchronize updates 7cd667172c2eb688e24e26cdfbf9f367ef278429

Author: gouzil

Original-README-ZH.md

@@ -7,7 +7,7 @@ GitHub app. 它是用 [TypeScript](https://www.typescriptlang.org) 和 [React](h
 
 ## 这是一个什么项目？
 
-这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.1](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.1)
+这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.2](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.2)
 
 ## 在哪里可以下载到?
 

README.md

@@ -23,7 +23,7 @@
 
 ## 这是一个什么项目？
 
-这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.1](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.1)
+这是一个把github desktop翻译成中文的项目, 当前翻译版本[release-3.1.2](https://github.com/gouzil/github-desktop-zh/tree/release-3.1.2)
 
 ## 部分截图
 

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "main": "./main.js",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
     "dexie": "^3.2.2",
     "dompurify": "^2.3.3",
-    "dugite": "^2.0.0",
+    "dugite": "^2.1.0",
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "focus-trap-react": "^8.1.0",

app/test/unit/git/rev-parse-test.ts

@@ -57,7 +57,16 @@ describe('git/rev-parse', () => {
         secondRepoPath,
         ''
       )
-      await git(['submodule', 'add', '../repo2'], firstRepoPath, '')
+
+      await git(
+        [
+          // Git 2.38 (backported into 2.35.5) changed the default here to 'user'
+          ...['-c', 'protocol.file.allow=always'],
+          ...['submodule', 'add', '../repo2'],
+        ],
+        firstRepoPath,
+        ''
+      )
 
       expect(await getRepositoryType(firstRepoPath)).toMatchObject({
         kind: 'regular',

app/yarn.lock

@@ -387,10 +387,10 @@ dompurify@^2.3.3:
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
   integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
 
-dugite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dugite/-/dugite-2.0.0.tgz#de0ef29b58caa863e25fecd318e99a0e6b05420b"
-  integrity sha512-0+1imU6NGzcvf42DDBMywZDyPBTNxKaG4IupDKfQbWU8S5fI+J3UVAQOrF0MNzGQYqv9G80Oz/LcS5043z05WQ==
+dugite@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-2.1.0.tgz#6f50c2244e57aaac2f36440aa7289815c73a688c"
+  integrity sha512-4l4jJz5zC6Q+/8doQNQZ9Ss3rmnO/JCHfOmQO+zGv+TIOUXimzfS02RvUOuFpEhZuaFTeFBSuK6ll/02TX3SxA==
   dependencies:
     progress "^2.0.3"
     tar "^6.1.11"

changelog.json

@@ -1,5 +1,6 @@
 {
   "releases": {
+    "3.1.2": ["[Improved] Upgrade embedded Git to 2.35.5"],
     "3.1.1": [
       "[Fixed] App correctly remembers undo commit prompt setting - #15408"
     ],