[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 53ea5f1df41: Restore vc-git helper function (bug#68183)
From: |
Sean Whitton |
Subject: |
master 53ea5f1df41: Restore vc-git helper function (bug#68183) |
Date: |
Wed, 21 Aug 2024 03:57:37 -0400 (EDT) |
branch: master
commit 53ea5f1df411aa349fb99d6b444d433a42ded594
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Commit: Sean Whitton <spwhitton@spwhitton.name>
Restore vc-git helper function (bug#68183)
* lisp/vc/vc-git.el (vc-git--cmds-in-progress): Restore; it was removed
in a previous refactoring patch, but we may still find use for it.
(vc-git-dir--in-progress-headers): Use it.
---
lisp/vc/vc-git.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 4d631c7e032..dedf6fdd219 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -748,8 +748,8 @@ or an empty string if none."
(and tracking (fmt "Tracking" tracking))
(and remote-url (fmt "Remote" remote-url)))))))
-(defun vc-git-dir--in-progress-headers ()
- "Return headers for Git commands in progress in this worktree."
+(defun vc-git--cmds-in-progress ()
+ "Return a list of Git commands in progress in this worktree."
(let ((gitdir (vc-git--git-path))
cmds)
;; See contrib/completion/git-prompt.sh in git.git.
@@ -765,6 +765,11 @@ or an empty string if none."
(push 'merge cmds))
(when (file-exists-p (expand-file-name "BISECT_START" gitdir))
(push 'bisect cmds))
+ cmds))
+
+(defun vc-git-dir--in-progress-headers ()
+ "Return headers for Git commands in progress in this worktree."
+ (let ((cmds (vc-git--cmds-in-progress)))
(cl-flet ((fmt (cmd name)
(when (memq cmd cmds)
;; For now just a heading, key bindings can be added
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 53ea5f1df41: Restore vc-git helper function (bug#68183),
Sean Whitton <=