From: Dan Nicolaescu Date: Tue, 19 Nov 2013 20:23:53 +0000 (-0500) Subject: * vc/vc-git.el (vc-git-dir-extra-headers): Add headers X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~781 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=826dc7b6b18e3608eac4c237316b9b43efdd8607;p=emacs.git * 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 9ad7e8a7d79..d052406332a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-19 Dan Nicolaescu + + * vc/vc-git.el (vc-git-dir-extra-headers): Add headers + when rebase or bisect are in progress. + 2013-11-19 Xue Fuqiao * filenotify.el (file-notify-add-watch): Doc fix. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 1d67deeeba3..fd5c91ef490 100644 --- 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