From 23c20c39683766525d17da52482dfad85b943f48 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 20 Sep 2020 12:12:36 +0200 Subject: [PATCH] Don't have vc-git-stash-list bug out on the .git directory * lisp/vc/vc-git.el (vc-git-stash-list): Don't bug out when running on the .git directory itself (bug#39285). --- lisp/vc/vc-git.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 84aeb0a1105..6ff6951dbc9 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1707,12 +1707,13 @@ This command shares argument histories with \\[rgrep] and \\[grep]." (vc-resynch-buffer (vc-git-root default-directory) t t)) (defun vc-git-stash-list () - (delete - "" - (split-string - (replace-regexp-in-string - "^stash@" " " (vc-git--run-command-string nil "stash" "list")) - "\n"))) + (when-let ((out (vc-git--run-command-string nil "stash" "list"))) + (delete + "" + (split-string + (replace-regexp-in-string + "^stash@" " " out) + "\n")))) (defun vc-git-stash-get-at-point (point) (save-excursion -- 2.39.5