emacs-diffs
[Top][All Lists]
Advanced

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

master 1507d61: Use vc-git-repository-url in vc-git-dir-extra-headers


From: Tassilo Horn
Subject: master 1507d61: Use vc-git-repository-url in vc-git-dir-extra-headers
Date: Mon, 15 Jun 2020 03:08:34 -0400 (EDT)

branch: master
commit 1507d61ebc5b572f6c9173ce9d76de379d919a94
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    Use vc-git-repository-url in vc-git-dir-extra-headers
    
    * lisp/vc/vc-git.el (vc-git-dir-extra-headers): Use
    vc-git-repository-url for getting the remote's URL.
---
 lisp/vc/vc-git.el | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 636f9df..96ee59d 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -748,13 +748,7 @@ or an empty string if none."
          (when (string-match "\\([^\n]+\\)" remote)
            (setq remote (match-string 1 remote)))
          (when remote
-           (setq remote-url
-                 (with-output-to-string
-                   (with-current-buffer standard-output
-                     (vc-git--out-ok "config"
-                                      (concat "remote." remote ".url"))))))
-         (when (string-match "\\([^\n]+\\)" remote-url)
-           (setq remote-url (match-string 1 remote-url))))
+           (setq remote-url (vc-git-repository-url dir remote))))
       (setq branch "not (detached HEAD)"))
     (when stash-list
       (let* ((len (length stash-list))
@@ -821,10 +815,10 @@ or an empty string if none."
      (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root 
dir)))
        (propertize  "\nRebase     : in progress" 'face 
'font-lock-warning-face))
      (if stash-list
-       (concat
-        (propertize "\nStash      : " 'face 'font-lock-type-face)
-        stash-button
-        stash-string)
+         (concat
+          (propertize "\nStash      : " 'face 'font-lock-type-face)
+          stash-button
+          stash-string)
        (concat
        (propertize "\nStash      : " 'face 'font-lock-type-face)
        (propertize "Nothing stashed"



reply via email to

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