Revert "* lisp/vc/vc-git.el (vc-git--rev-parse): Allow abbreviating commits"

This reverts commit 307ad210040251ea0de2e7f453350c4497bda874.

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 376892c7206e4995ae6fe56cff276d925c1cdb8a..74536309e2927a7e12899b6ec7055cce76879acc 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -373,9 +373,8 @@ in the order given by `git status'."
 
 (defun vc-git-working-revision (_file)
   "Git-specific version of `vc-working-revision'."
-  (let* ((process-file-side-effects nil)
-         (commit (vc-git--rev-parse "HEAD" t)))
-    (or (vc-git-symbolic-commit commit) commit)))
+  (let (process-file-side-effects)
+    (vc-git--rev-parse "HEAD")))
 
 (defun vc-git--symbolic-ref (file)
   (or
@@ -1694,15 +1693,11 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
     ;; does not (and cannot) quote.
     (vc-git--rev-parse (concat rev "~1"))))
 
-(defun vc-git--rev-parse (rev &optional short)
+(defun vc-git--rev-parse (rev)
   (with-temp-buffer
     (and
-     (if short
-         (vc-git--out-ok "rev-parse" "--short" rev)
-       (vc-git--out-ok "rev-parse" rev))
-     (string-trim-right
-      (buffer-substring-no-properties (point-min) (min (+ (point-min) 40)
-                                                       (point-max)))))))
+     (vc-git--out-ok "rev-parse" rev)
+     (buffer-substring-no-properties (point-min) (+ (point-min) 40)))))
 
 (defun vc-git-next-revision (file rev)
   "Git-specific version of `vc-next-revision'."