From 71047f4d45b44aeaedf8cb66eace3e4ec203db0f Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 28 Mar 2026 13:21:26 +0100 Subject: magit--git-insert: Only return error if return-error is non-nil Returning the Git error message causes many caller to signal a Lisp error, which isn't what we want when we enable `magit-git-debug'. --- lisp/magit-git.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 8bdd65d..b4b3200 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -565,7 +565,8 @@ insert the run command and stderr into the process buffer." (errmsg (message "%s" errmsg)) ((zerop exit)) ((message "Git returned with exit-code %s" exit)))) - (or errmsg exit)) + (or (and return-error errmsg) + exit)) (ignore-errors (delete-file log)))) (magit-process-git (list t nil) args))) -- cgit v1.0