gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5132 from iyefrat/sync-u

Browse Source 
cli/packages fixes
This commit is contained in:
Henrik Lissner 2021-06-04 14:18:29 -04:00 committed by GitHub
commit 2fa1fb136d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/cli/packages.el
View File

@ -402,9 +402,10 @@ declaration) or dependency thereof that hasn't already been."
(print! (start "\033[K(%d/%d) Fetching %s...%s") i total package esc) (print! (start "\033[K(%d/%d) Fetching %s...%s") i total package esc)
(doom--straight-with (straight-vc-fetch-from-remote recipe) (doom--straight-with (straight-vc-fetch-from-remote recipe)
(when .it (when .it
(setq output .output)
(straight-merge-package package) (straight-merge-package package)
(setq target-ref (straight-vc-get-commit type local-repo)) (setq target-ref (straight-vc-get-commit type local-repo))
(setq output (doom--commit-log-between ref target-ref)
commits (length (split-string output "\n" t)))
(or (not (doom--same-commit-p target-ref ref)) (or (not (doom--same-commit-p target-ref ref))
(cl-return))))) (cl-return)))))
@ -447,7 +448,8 @@ declaration) or dependency thereof that hasn't already been."
(doom--abbrev-commit ref) (doom--abbrev-commit ref)
(doom--abbrev-commit target-ref) (doom--abbrev-commit target-ref)
(if (and (integerp commits) (> commits 0)) (if (and (integerp commits) (> commits 0))
(format " [%d commit(s)]" commits))) (format " [%d commit(s)]" commits)
""))
(unless (string-empty-p output) (unless (string-empty-p output)
(let ((lines (split-string output "\n"))) (let ((lines (split-string output "\n")))
(setq output (setq output