procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Abort when looking at stashed changes

Browse source 
* lisp/vc/vc-git.el (vc-git-find-file-hook): Abort when looking at
stashed changes (bug#20292).
This commit is contained in:
Dmitry Gutov 2015-04-19 19:28:17 +03:00
parent 96bfe816d8
commit d35f2f4822
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc/vc-git.el
View file

@ -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)