diff options
| author | Tassilo Horn <tsdh@gnu.org> | 2020-06-15 09:07:12 +0200 |
|---|---|---|
| committer | Tassilo Horn <tsdh@gnu.org> | 2020-06-15 09:07:12 +0200 |
| commit | 1507d61ebc5b572f6c9173ce9d76de379d919a94 (patch) | |
| tree | af7a932e1df3934b35d7c64b2661005e1bbe8dd7 /lisp/vc/vc-git.el | |
| parent | 2e80328ba683e6205cd65bd3fb69da2563183e66 (diff) | |
| download | emacs-1507d61ebc5b572f6c9173ce9d76de379d919a94.tar.gz emacs-1507d61ebc5b572f6c9173ce9d76de379d919a94.tar.bz2 emacs-1507d61ebc5b572f6c9173ce9d76de379d919a94.zip | |
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.
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 636f9dfd0ca..96ee59db8e6 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" |