From: Dmitry Gutov <dgutov@yandex.ru>
Date: Thu, 28 Jun 2018 00:14:56 +0000 (+0300)
Subject: Remove extra process call from vc-git-find-file-hook
X-Git-Tag: emacs-26.1.90~313
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=93c41ce6aa64b14fc9bd7bdd0d909915a79191cd;p=emacs.git

Remove extra process call from vc-git-find-file-hook

* lisp/vc/vc-git.el (vc-git-find-file-hook): Resolve FIXMEs.
---

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 56e85378cb3..ad806b38545 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -974,16 +974,10 @@ This prompts for a branch to merge from."
 (defun vc-git-find-file-hook ()
   "Activate `smerge-mode' if there is a conflict."
   (when (and buffer-file-name
-             ;; FIXME:
-             ;; 1) the net result is to call git twice per file.
-             ;; 2) v-g-c-f is documented to take a directory.
-             ;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html
-             ;; FIXME: vc-git-state can return `conflict' now.
-             (vc-git-conflicted-files buffer-file-name)
+             (eq (vc-state buffer-file-name 'Git) 'conflict)
              (save-excursion
                (goto-char (point-min))
                (re-search-forward "^<<<<<<< " nil 'noerror)))
-    (vc-file-setprop buffer-file-name 'vc-state 'conflict)
     (smerge-start-session)
     (when vc-git-resolve-conflicts
       (add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local))