branch: elpa/magit
commit 929eb4dca516b337becd1ffc1d5abadb71dc032b
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit--run-git-stash: Match all error message
Give up on matching specific error messages for now.
If false-positives turn up, we might have to find another way.
Re #5253.
---
lisp/magit-stash.el | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 3c6f5b7cf11..8cfb9d7dd75 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -352,9 +352,7 @@ want to fall back to using \"--3way\", without being
prompted."
(with-environment-variables (("LC_ALL" "en_US.utf8"))
(magit-process-git t "stash" args))))
(buffer (current-buffer))
- (failed (or (looking-at "\\`error: patch failed:")
- (looking-at "\\`error: \
-Your local changes to the following files would be overwritten by merge"))))
+ (failed (looking-at "\\`error: ")))
(with-current-buffer (magit-process-buffer t)
(magit-process-finish-section
(magit-process-insert-section default-directory magit-git-executable
