mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

Use vc-git-repository-url in vc-git-dir-extra-headers

Browse Source 
* lisp/vc/vc-git.el (vc-git-dir-extra-headers): Use
vc-git-repository-url for getting the remote's URL.
This commit is contained in:
Tassilo Horn 2020-06-15 09:07:12 +02:00
parent 2e80328ba6
commit 1507d61ebc
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/vc/vc-git.el
View File

@ -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"