From 709325fb3e2eee49fa829ad5d15e36f40de4af69 Mon Sep 17 00:00:00 2001 From: Daniel Weschke Date: Sat, 30 Jan 2021 19:43:40 +0100 Subject: [PATCH] fix config update info --- lisp/my/my.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/my/my.el b/lisp/my/my.el index 29e0e6f0..98193952 100644 --- a/lisp/my/my.el +++ b/lisp/my/my.el @@ -426,7 +426,7 @@ Usage: (when (= (length remotes) 1) (let* ((remote-branch-name (concat (car remotes) "/" branch)) ;; @{u} may not configured, TODO: (if (magit-rev-parse "@{u}") ...) (diff-count (magit-rev-diff-count "@" remote-branch-name))) ;; i.e. git rev-list @...origin/master --count --left-right - (when with-update (magit-git-fetch (concat (car remotes) " " branch))) + (when with-update (magit-git-string "fetch" (car remotes) branch)) (setq diff (- (cadr diff-count) (car diff-count))))) (if as-text (if (= diff 0) "Up-to-date" @@ -435,11 +435,11 @@ Usage: diff)))) (defun my-dashboard-config-update () (if (featurep 'magit) - (let ((diff (my-magit-repo-status "~/.config/emacs" "master"))) + (let ((diff (my-magit-repo-status "~/.config/emacs" "master" t))) (if (= diff 0) "Up-to-date" (if (= diff 1) "1 update" - (if (> diff 0) (format "%s updates" diff) - (if (= diff -1) "1 commit unpushed" + (if (= diff -1) "1 commit unpushed" + (if (> diff 0) (format "%s updates" diff) (format "%s commits unpushed" (- diff))))))) (require 'magit nil t) "Check"))