Comments, removed old-point code which did nothing.
This commit is contained in:
parent
f735945848
commit
290d5fe70f
1 changed files with 2 additions and 4 deletions
6
magit.el
6
magit.el
|
@ -3620,7 +3620,7 @@ With prefix force the removal even it it hasn't been merged."
|
||||||
"Extract details from branch -va output."
|
"Extract details from branch -va output."
|
||||||
(string-match (concat
|
(string-match (concat
|
||||||
"^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe)
|
"^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe)
|
||||||
"\\(remotes/\\)?\\(.+?\\) +" ; branch name
|
"\\(remotes/\\)?\\(.+?\\) +" ; is it remote, branch name
|
||||||
|
|
||||||
"\\(?:"
|
"\\(?:"
|
||||||
"\\([0-9a-fA-F]\\{7\\}\\) " ; sha1
|
"\\([0-9a-fA-F]\\{7\\}\\) " ; sha1
|
||||||
|
@ -3647,7 +3647,6 @@ With prefix force the removal even it it hasn't been merged."
|
||||||
(unless (string= (buffer-name) magit-branches-buffer-name)
|
(unless (string= (buffer-name) magit-branches-buffer-name)
|
||||||
(switch-to-buffer-other-window magit-branches-buffer-name))
|
(switch-to-buffer-other-window magit-branches-buffer-name))
|
||||||
(let ((inhibit-read-only t)
|
(let ((inhibit-read-only t)
|
||||||
(old-point (point))
|
|
||||||
(branches (mapcar 'magit--branch-view-details
|
(branches (mapcar 'magit--branch-view-details
|
||||||
(magit-git-lines "branch" "-va"))))
|
(magit-git-lines "branch" "-va"))))
|
||||||
(erase-buffer)
|
(erase-buffer)
|
||||||
|
@ -3668,8 +3667,7 @@ With prefix force the removal even it it hasn't been merged."
|
||||||
'branch-name (cdr (assoc 'branch b))))
|
'branch-name (cdr (assoc 'branch b))))
|
||||||
branches
|
branches
|
||||||
"\n"))
|
"\n"))
|
||||||
(magit-show-branches-mode)
|
(magit-show-branches-mode))
|
||||||
(goto-char old-point))
|
|
||||||
(setq buffer-read-only t))
|
(setq buffer-read-only t))
|
||||||
|
|
||||||
(defvar magit-ediff-file)
|
(defvar magit-ediff-file)
|
||||||
|
|
Loading…
Reference in a new issue