daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

fix fetch before counting diffs

Browse Source
This commit is contained in:
Daniel Weschke
2021-02-01 12:17:02 +01:00
parent 709325fb3e
commit 3e98c9864e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/my/my.el
View File

@@ -424,9 +424,9 @@ Usage:
(remotes (magit-list-remotes)) (remotes (magit-list-remotes))
(diff)) (diff))
(when (= (length remotes) 1) (when (= (length remotes) 1)
(when with-update (magit-git-string "fetch" (car remotes) branch))
(let* ((remote-branch-name (concat (car remotes) "/" branch)) ;; @{u} may not configured, TODO: (if (magit-rev-parse "@{u}") ...) (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 (diff-count (magit-rev-diff-count "@" remote-branch-name))) ;; i.e. git rev-list @...origin/master --count --left-right
(when with-update (magit-git-string "fetch" (car remotes) branch))
(setq diff (- (cadr diff-count) (car diff-count))))) (setq diff (- (cadr diff-count) (car diff-count)))))
(if as-text (if as-text
(if (= diff 0) "Up-to-date" (if (= diff 0) "Up-to-date"