emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 8fe62b2ab5: Revert "* lisp/vc/vc-git.el (vc-git--rev-parse): Allo


From: Philip Kaludercic
Subject: master 8fe62b2ab5: Revert "* lisp/vc/vc-git.el (vc-git--rev-parse): Allow abbreviating commits"
Date: Sun, 6 Nov 2022 17:00:48 -0500 (EST)

branch: master
commit 8fe62b2ab571ba313587e8543006eca03ff36025
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Revert "* lisp/vc/vc-git.el (vc-git--rev-parse): Allow abbreviating commits"
    
    This reverts commit 307ad210040251ea0de2e7f453350c4497bda874.
---
 lisp/vc/vc-git.el | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 376892c720..74536309e2 100644
--- 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'."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]