branch: elpa/git-commit
commit 6f613c3278b40cee3c94fc3fbfabad183ecef9aa
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
Avoid implementation-specific "sha1" in comments and a doc-string
Given its experimental SHA-256 support, Git has been updating spots in
its documentation to avoid referring to an object name as "sha1".
There aren't very many spots in this code base and most are just
comments, but do the same.
---
lisp/magit-log.el | 14 +++++++-------
lisp/magit.el | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index fbaeff58c4..95e5bdced3 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1161,7 +1161,7 @@ Do not add this to a hook variable."
;; ++header is used.
(concat "^"
"\\(?4:[-_/|\\*o<>. ]*\\)" ; graph
- "\\(?1:[0-9a-fA-F]+\\)? " ; sha1
+ "\\(?1:[0-9a-fA-F]+\\)? " ; hash
"\\(?3:[^ \n]+\\)? " ; refs
"\\(?7:[BGUXYREN]\\)? " ; gpg
"\\(?5:[^ \n]*\\) " ; author
@@ -1173,31 +1173,31 @@ Do not add this to a hook variable."
(defconst magit-log-cherry-re
(concat "^"
"\\(?8:[-+]\\) " ; cherry
- "\\(?1:[0-9a-fA-F]+\\) " ; sha1
+ "\\(?1:[0-9a-fA-F]+\\) " ; hash
"\\(?2:.*\\)$")) ; msg
(defconst magit-log-module-re
(concat "^"
"\\(?:\\(?11:[<>]\\) \\)?" ; side
- "\\(?1:[0-9a-fA-F]+\\) " ; sha1
+ "\\(?1:[0-9a-fA-F]+\\) " ; hash
"\\(?2:.*\\)$")) ; msg
(defconst magit-log-bisect-vis-re
(concat "^"
"\\(?4:[-_/|\\*o<>. ]*\\)" ; graph
- "\\(?1:[0-9a-fA-F]+\\)?\0" ; sha1
+ "\\(?1:[0-9a-fA-F]+\\)?\0" ; hash
"\\(?3:[^\0\n]+\\)?\0" ; refs
"\\(?2:.*\\)$")) ; msg
(defconst magit-log-bisect-log-re
(concat "^# "
"\\(?3:[^: \n]+:\\) " ; "refs"
- "\\[\\(?1:[^]\n]+\\)\\] " ; sha1
+ "\\[\\(?1:[^]\n]+\\)\\] " ; hash
"\\(?2:.*\\)$")) ; msg
(defconst magit-log-reflog-re
(concat "^"
- "\\(?1:[^\0\n]+\\)\0" ; sha1
+ "\\(?1:[^\0\n]+\\)\0" ; hash
"\\(?5:[^\0\n]*\\)\0" ; author
"\\(?:\\(?:[^@\n]+@{\\(?6:[^}\n]+\\)}\0" ; date
"\\(?10:merge \\|autosave \\|restart \\|[^:\n]+: \\)?" ; refsub
@@ -1210,7 +1210,7 @@ Do not add this to a hook variable."
(defconst magit-log-stash-re
(concat "^"
- "\\(?1:[^\0\n]+\\)\0" ; "sha1"
+ "\\(?1:[^\0\n]+\\)\0" ; "hash"
"\\(?5:[^\0\n]*\\)\0" ; author
"\\(?6:[^\0\n]+\\)\0" ; date
"\\(?2:.*\\)$")) ; msg
diff --git a/lisp/magit.el b/lisp/magit.el
index 80a16463e7..e4c8b1f511 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -92,7 +92,7 @@ own faces for the `header-line', or for parts of the
(defface magit-hash
'((((class color) (background light)) :foreground "grey60")
(((class color) (background dark)) :foreground "grey40"))
- "Face for the sha1 part of the log output."
+ "Face for the commit object name in the log output."
:group 'magit-faces)
(defface magit-tag
