]> git.eshelyaron.com Git - emacs.git/commit
; Re-apply accidentally reverted commit
authorKévin Le Gouguec <kevin.legouguec@gmail.com>
Mon, 12 Feb 2024 07:29:19 +0000 (08:29 +0100)
committerEshel Yaron <me@eshelyaron.com>
Mon, 18 Mar 2024 15:44:36 +0000 (16:44 +0100)
commitf4f5bbd4159f3f80ea3bc631ef9f34015288f3e3
tree778fbb5c508d423da53add916427d35740b5dac2
parent2f5d466332e4784bff0134465ed0aa049ee3f3ce
; Re-apply accidentally reverted commit

This re-applies:

  2024-03-17 "Fix vc-dir when "remote" Git branch is local"
  (21828f288ef)

reverted as part of the unrelated:

  2024-03-17 "Update modus-themes to their 4.4.0 version"
  (67b0c1c09ea)

The original commit message follows:

Fix vc-dir when "remote" Git branch is local

While in there, add that "tracking" branch to the vc-dir
buffer.  For bug#68183.

* lisp/vc/vc-git.el (vc-git-dir-extra-headers): Reduce
boilerplate with new function 'vc-git--out-ok'; stop calling
vc-git-repository-url when REMOTE is "." to avoid throwing an
error; display tracking branch; prefer "none (<details...>)" to
"not (<details...>)" since that reads more grammatically
correct.
(vc-git--out-ok): Add documentation.
(vc-git--out-str): New function to easily get the output from a
Git command.
* test/lisp/vc/vc-git-tests.el (vc-git-test--with-repo)
(vc-git-test--run): New helpers, defined to steer clear of
vc-git-- internal functions.
(vc-git-test-dir-track-local-branch): Check that vc-dir does
not crash.

(cherry picked from commit 8d4a8b7dfd0905defac172cc58c2252dc1b39ad7)
lisp/vc/vc-git.el
test/lisp/vc/vc-git-tests.el