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

Make discarding staged diffs work.

Browse source 
* magit.el (magit-discard-diff): Added stagedp parameter and checkout
from HEAD if it is true.
(magit-discard-item): Use it.
This commit is contained in:
Marius Vollmer 2009-06-06 19:42:02 +03:00
parent 01f37a8c2d
commit a76f44c1d8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
magit.el
View file

@ -2886,7 +2886,7 @@ Prefix arg means justify as well."
((untracked file)
(magit-ignore-file info current-prefix-arg t))))
(defun magit-discard-diff (diff)
(defun magit-discard-diff (diff stagedp)
(let ((kind (magit-diff-item-kind diff))
(file (magit-diff-item-file diff)))
(cond ((eq kind 'deleted)
@ -2898,7 +2898,9 @@ Prefix arg means justify as well."
(magit-run-git "rm" "-f" "--" file)))
(t
(if (yes-or-no-p (format "Discard changes to %s? " file))
(magit-run-git "checkout" "--" file))))))
(if stagedp
(magit-run-git "checkout" "HEAD" "--" file)
(magit-run-git "checkout" "--" file)))))))
(defun magit-discard-item ()
(interactive)
@ -2923,9 +2925,9 @@ Prefix arg means justify as well."
(magit-apply-hunk-item-reverse item "--index"))
(error "Can't discard this hunk. Please unstage it first.")))
((unstaged diff)
(magit-discard-diff item))
(magit-discard-diff item nil))
((staged diff)
(magit-discard-diff item))
(magit-discard-diff item t))
((hunk)
(error "Can't discard this hunk"))
((diff)