[Emacs-diffs] master d35f2f4: Abort when looking at stashed changes

[Dmitry Gutov]

branch: master
commit d35f2f482273a822df695202f4a3bf1a5e473e63
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Abort when looking at stashed changes
    
    * lisp/vc/vc-git.el (vc-git-find-file-hook): Abort when looking at
    stashed changes (bug#20292).
---
 lisp/vc/vc-git.el |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 48e22c8..8f7015e 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -800,7 +800,9 @@ This prompts for a branch to merge from."
              (vc-git-conflicted-files buffer-file-name)
              (save-excursion
                (goto-char (point-min))
-               (re-search-forward "^<<<<<<< " nil 'noerror)))
+               (and (re-search-forward "^>>>>>>> " nil 'noerror)
+                    ;; Stashes are tricky (bug#20292).
+                    (not (looking-at "Stashed changes")))))
     (vc-file-setprop buffer-file-name 'vc-state 'conflict)
     (smerge-start-session)
     (add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local)