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

Improve treatment of unmerged files in "Staged changes".

Browse source 
* magit.el (magit-wash-diff): Recognize "Unmerged path" lines and
create a diff section for it.
* magit.el (magit-unstage-item): Don't unstage unmerged files.
This commit is contained in:
Marius Vollmer 2009-03-22 01:40:40 +02:00
parent 904e6ee405
commit 6f2d0955e5
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
magit.el
View file

@ -1434,7 +1434,14 @@ Please see the manual for a complete description of Magit.
(defvar magit-hide-diffs nil)
(defun magit-wash-diff ()
(cond ((looking-at "^diff")
(cond ((looking-at "^\\* Unmerged path \\(.*\\)")
(let ((file (match-string-no-properties 1)))
(magit-with-section file 'diff
(delete-region (point) (line-end-position))
(insert "\tUnmerged " file "\n")
(magit-set-section-info (list 'unmerged file nil))))
t)
((looking-at "^diff")
(let ((magit-section-hidden-default magit-hide-diffs))
(magit-with-section (magit-current-line) 'diff
(let ((file (magit-diff-line-file))
@ -1899,6 +1906,8 @@ in log buffer."
((staged diff hunk)
(magit-apply-hunk-item-reverse item "--cached"))
((staged diff)
(if (eq (car info) 'unmerged)
(error "Can't unstage a unmerged file. Resolve it first."))
(magit-run-git "reset" "-q" "HEAD" "--" (magit-diff-item-file item)))
((unstaged *)
(error "Already unstaged"))