Commit 45651154 authored by Dmitry Gutov's avatar Dmitry Gutov

Add new option vc-git-resolve-conflicts

* lisp/vc/vc-git.el (vc-git-resolve-conflicts): New variable.
(vc-git-find-file-hook): Add to after-save-hook only when the
above is non-nil.
(vc-git-resolve-when-done): Update to honor the new variable.
parent 0d3451c7
......@@ -130,6 +130,19 @@ If nil, use the value of `vc-annotate-switches'. If t, use no switches."
:version "25.1"
:group 'vc-git)
(defcustom vc-git-resolve-conflicts t
"When non-nil, mark conflicted file as resolved upon saving.
That is performed after all conflict markers in it have been
removed. If the value is `unstage-maybe', and no merge is in
progress, then after the last conflict is resolved, also clear
the staging area."
:type '(choice (const :tag "Don't resolve" nil)
(const :tag "Resolve" t)
(const :tag "Resolve and maybe unstage all files"
:version "25.1"
:group 'vc-git)
(defcustom vc-git-program "git"
"Name of the Git executable (excluding any arguments)."
:version "24.1"
......@@ -801,12 +814,16 @@ This prompts for a branch to merge from."
(goto-char (point-min))
(unless (re-search-forward "^<<<<<<< " nil t)
(if (file-exists-p (expand-file-name ".git/MERGE_HEAD"
(vc-git-root buffer-file-name)))
;; Doing a merge.
(vc-git-command nil 0 buffer-file-name "add")
;; Doing something else. Likely applying a stash (bug#20292).
(vc-git-command nil 0 buffer-file-name "reset"))
(vc-git-command nil 0 buffer-file-name "add")
(when (and
(eq vc-git-resolve-conflicts 'unstage-maybe)
;; Not doing a merge. Likely applying a stash
;; (bug#20292).
(file-exists-p (expand-file-name ".git/MERGE_HEAD"
(vc-git-root buffer-file-name))))
(not (vc-git-conflicted-files (vc-git-root buffer-file-name))))
(vc-git-command nil 0 nil "reset"))
;; Remove the hook so that it is not called multiple times.
(remove-hook 'after-save-hook 'vc-git-resolve-when-done t))))
......@@ -823,7 +840,8 @@ This prompts for a branch to merge from."
(re-search-forward "^<<<<<<< " nil 'noerror)))
(vc-file-setprop buffer-file-name 'vc-state 'conflict)
(add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local)
(when vc-git-resolve-conflicts
(add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local))
(message "There are unresolved conflicts in this file")))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment