Since `magit-sha1-abbrev-length' and `magit-log-cutoff-length' are integers, the format string token should be %d instead of %s.
Signed-off-by: Pieter Praet <[email protected]> --- magit.el | 22 +++++++++++----------- tests/magit-tests.el | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/magit.el b/magit.el index 0ffb972..d6fad88 100644 --- a/magit.el +++ b/magit.el @@ -1346,7 +1346,7 @@ (defun magit-assert-one-parent (commit command) (defun magit-format-commit (commit format) (magit-git-string "log" "--max-count=1" - (format "--abbrev=%s" magit-sha1-abbrev-length) + (format "--abbrev=%d" magit-sha1-abbrev-length) (concat "--pretty=format:" format) commit)) @@ -3552,13 +3552,13 @@ (defun magit-apply-hunk-item-reverse (hunk &rest args) (defvar magit-git-log-options (list "--pretty=format:* %h %s" - (format "--abbrev=%s" magit-sha1-abbrev-length))) + (format "--abbrev=%d" magit-sha1-abbrev-length))) ;; --decorate=full otherwise some ref prefixes are stripped ;; '("--pretty=format:* %H%d %s" "--decorate=full")) (defvar magit-git-reflog-options (list "--pretty=format:* \C-?%h\C-?%gs" - (format "--abbrev=%s" magit-sha1-abbrev-length))) + (format "--abbrev=%d" magit-sha1-abbrev-length))) (defconst magit-unpushed-or-unpulled-commit-re (concat "^\\* " @@ -5925,9 +5925,9 @@ (defun magit-refresh-log-buffer (range style args) (magit-rev-range-describe range "Commits")) (apply-partially 'magit-wash-color-log style) `("log" - ,(format "--max-count=%s" magit-log-cutoff-length) + ,(format "--max-count=%d" magit-log-cutoff-length) "--abbrev-commit" - ,(format "--abbrev=%s" magit-sha1-abbrev-length) + ,(format "--abbrev=%d" magit-sha1-abbrev-length) ,@(cl-case style (long (append (list "--stat") @@ -6003,7 +6003,7 @@ (defun magit-refresh-reflog-buffer (head args) (append magit-git-reflog-options (list "--walk-reflogs" - (format "--max-count=%s" magit-log-cutoff-length) + (format "--max-count=%d" magit-log-cutoff-length) args))))) (define-derived-mode magit-reflog-mode magit-log-mode "Magit Reflog" @@ -6206,9 +6206,9 @@ (defun magit-refresh-wazzup-buffer (head all) "")) 'magit-wash-log "log" - (format "--max-count=%s" magit-log-cutoff-length) + (format "--max-count=%d" magit-log-cutoff-length) "--abbrev-commit" - (format "--abbrev=%s" magit-sha1-abbrev-length) + (format "--abbrev=%d" magit-sha1-abbrev-length) "--graph" "--pretty=oneline" (format "%s..%s" head ref) @@ -6257,9 +6257,9 @@ (defun magit-refresh-file-log-buffer (file range style) (magit-rev-range-describe range (format "Commits for file %s" file)) (apply-partially 'magit-wash-log style) `("log" - ,(format "--max-count=%s" magit-log-cutoff-length) + ,(format "--max-count=%d" magit-log-cutoff-length) ,"--abbrev-commit" - ,(format "--abbrev=%s" magit-sha1-abbrev-length) + ,(format "--abbrev=%d" magit-sha1-abbrev-length) ,@(cond ((eq style 'long) (list "--stat" "-z")) ((eq style 'oneline) (list "--pretty=oneline")) (t nil)) @@ -6929,7 +6929,7 @@ (defun magit-refresh-branch-manager () "branches" nil 'magit-wash-branches "branch" "-vva" - (format "--abbrev=%s" magit-sha1-abbrev-length) + (format "--abbrev=%d" magit-sha1-abbrev-length) magit-custom-options))) (magit-define-command branch-manager () diff --git a/tests/magit-tests.el b/tests/magit-tests.el index 87a457f..09cbf61 100644 --- a/tests/magit-tests.el +++ b/tests/magit-tests.el @@ -57,7 +57,7 @@ (defun magit-tests--modify-and-commit (filename) (defun magit-tests--head-hash () (magit-git-string - "rev-parse" (format "--short=%s" magit-sha1-abbrev-length) "HEAD")) + "rev-parse" (format "--short=%d" magit-sha1-abbrev-length) "HEAD")) (defun magit-tests--should-have-item-title (title section-path) (magit-status default-directory) -- 1.7.11.1 -- --- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
