mirror of https://github.com/logseq/logseq
chore: log error in commit-and-force-push!
parent
768261abed
commit
21fc2fcf2e
|
@ -1,11 +1,11 @@
|
||||||
(ns frontend.handler.git
|
(ns frontend.handler.git
|
||||||
(:require [frontend.util :as util :refer-macros [profile]]
|
(:require [frontend.util :as util :refer-macros [profile]]
|
||||||
[promesa.core :as p]
|
[promesa.core :as p]
|
||||||
|
[lambdaisland.glogi :as log]
|
||||||
[frontend.state :as state]
|
[frontend.state :as state]
|
||||||
[frontend.db :as db]
|
[frontend.db :as db]
|
||||||
[frontend.git :as git]
|
[frontend.git :as git]
|
||||||
[frontend.date :as date]
|
[frontend.date :as date]
|
||||||
[goog.object :as gobj]
|
|
||||||
[frontend.handler.notification :as notification]
|
[frontend.handler.notification :as notification]
|
||||||
[frontend.handler.route :as route-handler]
|
[frontend.handler.route :as route-handler]
|
||||||
[frontend.handler.common :as common-handler]
|
[frontend.handler.common :as common-handler]
|
||||||
|
@ -42,6 +42,7 @@
|
||||||
(defn commit-and-force-push!
|
(defn commit-and-force-push!
|
||||||
[commit-message pushing?]
|
[commit-message pushing?]
|
||||||
(when-let [repo (frontend.state/get-current-repo)]
|
(when-let [repo (frontend.state/get-current-repo)]
|
||||||
|
(->
|
||||||
(p/let [remote-oid (common-handler/get-remote-ref repo)
|
(p/let [remote-oid (common-handler/get-remote-ref repo)
|
||||||
commit-oid (git/commit repo commit-message (array remote-oid))
|
commit-oid (git/commit repo commit-message (array remote-oid))
|
||||||
result (git/write-ref! repo commit-oid)
|
result (git/write-ref! repo commit-oid)
|
||||||
|
@ -49,7 +50,9 @@
|
||||||
push-result (git/push repo token true)]
|
push-result (git/push repo token true)]
|
||||||
(reset! pushing? false)
|
(reset! pushing? false)
|
||||||
(notification/clear! nil)
|
(notification/clear! nil)
|
||||||
(route-handler/redirect! {:to :home}))))
|
(route-handler/redirect! {:to :home}))
|
||||||
|
(p/catch (fn [error]
|
||||||
|
(log/error :git/commit-and-force-push! error))))))
|
||||||
|
|
||||||
(defn git-set-username-email!
|
(defn git-set-username-email!
|
||||||
[repo-url {:keys [name email]}]
|
[repo-url {:keys [name email]}]
|
||||||
|
|
Loading…
Reference in New Issue