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

Use `magit-section-case' to get branch from wazzup.

Browse source
This commit is contained in:
Phil Jackson 2010-05-06 00:27:20 +01:00
parent 179f1b9809
commit 8bf8a36db6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
magit.el
View file

@ -2558,9 +2558,10 @@ Fails if working tree or staging area contain uncommitted changes.
;;; Merging ;;; Merging
(defun magit-guess-branch () (defun magit-guess-branch ()
(let ((sec (magit-current-section))) (magit-section-case (item info)
(if (and sec (eq (magit-section-type sec) 'wazzup)) ((wazzup commit)
(magit-section-info sec)))) (magit-section-info (magit-section-parent item)))
((wazzup) info)))
(defun magit-manual-merge (rev) (defun magit-manual-merge (rev)
"Merge REVISION into the current 'HEAD'; leave changes uncommitted. "Merge REVISION into the current 'HEAD'; leave changes uncommitted.