gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly discard new files.

Browse source 
* magit.el (magit-discard-item): Use git rm to discard new files.
This commit is contained in:
Marius Vollmer 2008-09-07 17:37:57 +03:00
parent e4ccc99536
commit d80109e4ef
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
magit.el
View file

@ -1581,9 +1581,14 @@ Please see the manual for a complete description of Magit.
(magit-apply-hunk-item item "--reverse" "--index"))
(error "Can't discard this hunk. Please unstage it first.")))
((diff)
(let ((file (magit-diff-item-file item)))
(if (yes-or-no-p (format "Discard changes to %s? " file))
(magit-run "git" "checkout" "--" file))))))
(let ((kind (magit-diff-item-kind item))
(file (magit-diff-item-file item)))
(cond ((eq kind 'new)
(if (yes-or-no-p (format "Delete %s? " file))
(magit-run "git" "rm" "-f" "--" file)))
(t
(if (yes-or-no-p (format "Discard changes to %s? " file))
(magit-run "git" "checkout" "--" file))))))))
(defun magit-visit-item ()
(interactive)