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

* lisp/vc/vc-git.el (vc-git-mergebase): More meaningful error message.

Browse source 
Display a readable error message instead of signaling an error on nil value.
This commit is contained in:
Juri Linkov 2021-11-10 20:41:19 +02:00
parent a9148cdee5
commit 2963de6540
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1256,7 +1256,10 @@ log entries."
(defun vc-git-mergebase (rev1 &optional rev2)
(unless rev2 (setq rev2 "HEAD"))
(string-trim-right (vc-git--run-command-string nil "merge-base" rev1 rev2)))
(let ((base (vc-git--run-command-string nil "merge-base" rev1 rev2)))
(if base
(string-trim-right base)
(error "No common ancestor for merge base"))))
(defvar log-view-message-re)
(defvar log-view-file-re)