From a7c4f42ef073e8ba303dd8b8c001a9f71399828d Mon Sep 17 00:00:00 2001
From: NGPixel <ngpixel@gmail.com>
Date: Sun, 30 Apr 2017 00:49:26 -0400
Subject: [PATCH] fix: Incorrect git remote rm error

---
 package.json                |   1 +
 server/configure.js         |   4 ++--
 server/views/pages/view.pug |   3 +++
 yarn.lock                   | Bin 253374 -> 254139 bytes
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 34c0662b..6a37f746 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "connect-mongo": "^1.3.2",
     "cookie-parser": "^1.4.3",
     "cron": "^1.2.1",
+    "diff2html": "^2.3.0",
     "execa": "^0.6.3",
     "express": "^4.15.2",
     "express-brute": "^1.0.1",
diff --git a/server/configure.js b/server/configure.js
index d1b1c1ea..cec9ac1b 100644
--- a/server/configure.js
+++ b/server/configure.js
@@ -221,8 +221,8 @@ module.exports = (port, spinner) => {
       },
       () => {
         if (req.body.gitUseRemote === false) { return false }
-        return exec.stdout('git', ['remote', 'remove', 'origin'], { cwd: gitDir }).catch(err => {
-          if (_.includes(err.message, 'No such remote')) {
+        return exec.stdout('git', ['remote', 'rm', 'origin'], { cwd: gitDir }).catch(err => {
+          if (_.includes(err.message, 'No such remote') || _.includes(err.message, 'Could not remove')) {
             return true
           } else {
             throw err
diff --git a/server/views/pages/view.pug b/server/views/pages/view.pug
index 999428f6..bcf55d62 100644
--- a/server/views/pages/view.pug
+++ b/server/views/pages/view.pug
@@ -18,6 +18,9 @@ block rootNavRight
     a.button.is-outlined(href='/source/' + pageData.meta.path)
       i.icon-loader
       span Source
+    a.button.is-outlined(href='/diff/' + pageData.meta.path)
+      i.icon-flow-merge
+      span Diff
     if rights.write
       a.button(href='/edit/' + pageData.meta.path)
         i.icon-document-text
diff --git a/yarn.lock b/yarn.lock
index 040cfa0302a03c17052d8887c442c165ae5d5b3d..96e8a8ff78eeeb9b39f8cf3364c932feaba9b461 100644
GIT binary patch
delta 519
zcmYjOze^lJ7-eTMi3f5JBo`}}yY_Bwe(laoBUi-O1yk4xJF_#phC~xw5UdO-%-L#~
zl);o1HipFr3H}8d{1dE0{)A+9kA+P2y>Gtvc;EMaTy?Lmy9XD+J1|Fz^37`(%?GQ`
zx2$c@cr?!1dPE?F2$uQ&fb!TX#0Ax<u&G28an2-_QfaAqY!ufviG{=6u(w_dMEy+)
z2}J!)<X^Fqr`zz=Zqr4O%({C;TJGf|Yf4@CA3qIgztgGd6VFBv4Wk;kFSo%{_u^|f
ztiFNZ^3#KvnESH`o*bXw!_`*an{Ufe%_og_rZZ`9sxn3-!z?j8;nFaiaUlh#L?NQN
zvd8b2dhX`|c+~SYTI1V0Z_B8Uy%t8**5}~##_bNk#2ppjF=~&4m9lZFuu28tsU<Y#
zF=muW#7M&8*fN2w!KV6~1GKzQYffg8!^oX{1ZUOw5afZon}Wr|jVY)$rr{}?YwqG+
zeh8nrmG9xhwFdhY|390LsCHXNB(-2hlgtMpu;A7rq;$dzCY&k82<C~wex~|;8U7ml
E1KA0jZU6uP

delta 61
zcmV-D0K)&f!4JN>4}i1*aRQgoE&>*}eggsLmA5aN0iDmcT519$AGbD&0%rl2jfn!O
ThntH6x0{OtxG=Z$yaUH06!jU<