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

Use unless' to have one fewer not'

Browse source 
* lisp/vc/vc-git.el (vc-git-resolve-when-done): Use `unless' to
have one fewer `not'.
This commit is contained in:
Dmitry Gutov 2015-05-16 17:11:33 +03:00
parent 30151ee56b
commit becc0129ca
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -810,14 +810,12 @@ This prompts for a branch to merge from."
(goto-char (point-min))
(unless (re-search-forward "^<<<<<<< " nil t)
(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).
(not
(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))))
(unless (or
(not (eq vc-git-resolve-conflicts 'unstage-maybe))
;; Doing a merge, so bug#20292 doesn't apply.
(file-exists-p (expand-file-name ".git/MERGE_HEAD"
(vc-git-root buffer-file-name)))
(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))))