* vc/vc-git.el (vc-git-dir-extra-headers): Add headers

when rebase or bisect are in progress.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ad7e8a7d79ebe132280e6013bda936fabd9634e..d052406332a032eb5410d4407156977eca2536c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-19  Dan Nicolaescu  <dann@gnu.org>
+
+       * vc/vc-git.el (vc-git-dir-extra-headers): Add headers
+       when rebase or bisect are in progress.
+
 2013-11-19  Xue Fuqiao  <xfq.free@gmail.com>
 
        * filenotify.el (file-notify-add-watch): Doc fix.

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 1d67deeeba3dac780a8eb7d3fd3a2b997b05b93e..fd5c91ef4904a0db162981a3525bb00d1919c40e 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -559,6 +559,11 @@ or an empty string if none."
        (propertize remote-url
                    'face 'font-lock-variable-name-face)))
      "\n"
+     ;; For now just a heading, key bindings can be added later for various bisect actions
+     (when (file-exists-p (expand-file-name ".git/BISECT_START" (vc-git-root _dir)))
+       (propertize  "Bisect     : in progress\n" 'face 'font-lock-warning-face))
+     (when (file-exists-p (expand-file-name ".git/rebase-apply" (vc-git-root _dir)))
+       (propertize  "Rebase     : in progress\n" 'face 'font-lock-warning-face))
      (if stash
        (concat
        (propertize "Stash      :\n" 'face 'font-lock-type-face