branch: elpa/magit
commit 90c6aa79164ea43061349c98bddb66ba0edf03ff
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit--run-git-stash: Match another expected error message
Re #5253.
---
lisp/magit-stash.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 8e7fa55cfee..d363fabc99b 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -347,8 +347,9 @@ the user whether to use \"--3way\" or \"--reject\"."
(with-environment-variables (("LC_ALL" "en_US.utf8"))
(magit-process-git t "stash" args))))
(buffer (current-buffer))
- (failed (looking-at "\\`error: \
-Your local changes to the following files would be overwritten by merge")))
+ (failed (or (looking-at "\\`error: patch failed:")
+ (looking-at "\\`error: \
+Your local changes to the following files would be overwritten by merge"))))
(with-current-buffer (magit-process-buffer t)
(magit-process-finish-section
(magit-process-insert-section default-directory magit-git-executable
