Merge pull request #14 from gouzil/release-3.1.6

feat(sync): Synchronize updates 3abd7b29ac5b84095a2fcc0e5a8537a197652ac9

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "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.2.0",
+    "dugite": "^2.3.0",
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "focus-trap-react": "^8.1.0",

app/src/lib/git/diff.ts

@@ -530,7 +530,7 @@ function getMediaType(extension: string) {
  * changes based on what the user has configured.
  */
 const lineEndingsChangeRegex =
-  /warning: (CRLF|CR|LF) will be replaced by (CRLF|CR|LF) in .*/
+  /warning: (CRLF|CR|LF) will be replaced by (CRLF|CR|LF) the .*/
 
 /**
  * Utility function for inspecting the stderr output for the line endings

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.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dugite/-/dugite-2.2.0.tgz#6678a463acd2e3e489736555eb2baf4224d087db"
-  integrity sha512-cCzmtNj0UNglm94gCgw0KkEuzlVp2DhRJ/rwyQVXju/jFQTE1WWBVe5YCSanCIUSyu80E1JqQvCvQ9ywcmRb1Q==
+dugite@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-2.3.0.tgz#ff6fdb4c899f84ed6695c9e01eaf4364a6211f13"
+  integrity sha512-78zuD3p5lx2IS8DilVvHbXQXRo+hGIb3EAshTEC3ZyBLyArKegA8R/6c4Ne1aUlx6JRf3wmKNgYkdJOYMyj9aA==
   dependencies:
     progress "^2.0.3"
     tar "^6.1.11"

changelog.json

@@ -1,5 +1,8 @@
 {
   "releases": {
+    "3.1.6": [
+      "[Improved] Upgrade embedded Git to 2.39.1 and Git LFS to 3.3.0 - #15915"
+    ],
     "3.1.5": [
       "[Added] Enable menu option to Force-push branches that have diverged - #15211",
       "[Added] Add menu option to Fetch the current repository at any time - #7805",