Make discarding work again.
* magit.el (magit-discard-item): Don't escape twice.
This commit is contained in:
parent
f2e8155904
commit
0264295302
1 changed files with 1 additions and 2 deletions
3
magit.el
3
magit.el
|
@ -1986,8 +1986,7 @@ Prefix arg means justify as well."
|
|||
(file (magit-diff-item-file item)))
|
||||
(cond ((eq kind 'deleted)
|
||||
(when (yes-or-no-p (format "Resurrect %s? " file))
|
||||
(magit-shell "git reset -q -- %s"
|
||||
(magit-escape-for-shell file))
|
||||
(magit-shell "git reset -q -- %s" file)
|
||||
(magit-run "git" "checkout" "--" file)))
|
||||
((eq kind 'new)
|
||||
(if (yes-or-no-p (format "Delete %s? " file))
|
||||
|
|
Loading…
Reference in a new issue