;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
;; Author: Alexandre Julliard <julliard@winehq.org>
;; Keywords: vc tools
(smerge-start-session)
(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")))
+ (vc-message-unresolved-conflicts buffer-file-name)))
;;; HISTORY FUNCTIONS
(autoload 'vc-switches "vc")
-(defun vc-git-diff (files &optional rev1 rev2 buffer async)
+(defun vc-git-diff (files &optional rev1 rev2 buffer _async)
"Get a difference report using Git between two revisions of FILES."
(let (process-file-side-effects
(command "diff-tree"))
(unless rev1 (setq rev1 "HEAD")))
(if vc-git-diff-switches
(apply #'vc-git-command (or buffer "*vc-diff*")
- (if async 'async 1)
+ 1 ; bug#21969
files
command
"--exit-code"
(defun vc-git-stash-apply-at-point ()
(interactive)
- (vc-git-stash-apply (format "stash@%s" (vc-git-stash-get-at-point (point)))))
+ (let (vc-dir-buffers) ; Small optimization.
+ (vc-git-stash-apply (format "stash@%s" (vc-git-stash-get-at-point (point)))))
+ (vc-dir-refresh))
(defun vc-git-stash-pop-at-point ()
(interactive)
- (vc-git-stash-pop (format "stash@%s" (vc-git-stash-get-at-point (point)))))
+ (let (vc-dir-buffers) ; Likewise.
+ (vc-git-stash-pop (format "stash@%s" (vc-git-stash-get-at-point (point)))))
+ (vc-dir-refresh))
(defun vc-git-stash-menu (e)
(interactive "e")