mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 09:14:18 +00:00
vc-pull-and-push: Fix when visiting untracked files
* lisp/vc/vc.el (vc-pull-and-push): Don't fail when called from buffers visiting unregistered or ignored files.
This commit is contained in:
parent
f408460cb1
commit
ee8b2d8ae2
1 changed files with 2 additions and 4 deletions
|
|
@ -4741,8 +4741,6 @@ It also signals an error in a Bazaar bound branch."
|
|||
"First pull, and then push the current branch.
|
||||
The push will only be performed if the pull operation was successful.
|
||||
|
||||
You must be visiting a version controlled file, or in a `vc-dir' buffer.
|
||||
|
||||
On a distributed version control system, this runs a \"pull\"
|
||||
operation on the current branch, prompting for the precise
|
||||
command if required. Optional prefix ARG non-nil forces a prompt
|
||||
|
|
@ -4753,8 +4751,8 @@ where the pull operation returns a process.
|
|||
On a non-distributed version control system, this signals an error.
|
||||
It also signals an error in a Bazaar bound branch."
|
||||
(interactive "P")
|
||||
(let* ((vc-fileset (vc-deduce-fileset t))
|
||||
(backend (car vc-fileset)))
|
||||
(let* ((fileset (vc-deduce-fileset t t))
|
||||
(backend (car fileset)))
|
||||
(if (vc-find-backend-function backend 'pull)
|
||||
(when-let* ((proc (vc-call-backend backend 'pull arg))
|
||||
(buf (and (processp proc) (process-buffer proc))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue