branch: externals/vc-got
commit 1c46988ea9e81a57a4c9569a0fee19108f861d08
Author: Timo Myyrä <timo.my...@bittivirhe.fi>
Commit: Omar Polo <o...@omarpolo.com>
use shorter way to poll branch from user in vc-got-merge-branch
---
vc-got.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/vc-got.el b/vc-got.el
index 68a9899dec..254c628c00 100755
--- a/vc-got.el
+++ b/vc-got.el
@@ -632,11 +632,9 @@ If REV is t, checkout from the head."
(defun vc-got-merge-branch ()
"Prompt for a branch and integrate it into the current one."
;; XXX: be smart and try to "got rebase" if "got integrate" fails?
- (let* ((branches (cl-loop for (branch . commit) in (vc-got--list-branches)
- collect branch))
- (branch (completing-read "Merge from branch: " branches)))
- (when branch
- (vc-got--integrate branch))))
+ (when-let ((branch (completing-read "Merge from branch: "
+ (mapcar #'car (vc-got--list-branches)))))
+ (vc-got--integrate branch)))
(defun vc-got--proc-filter (proc s)
"Custom output filter for async process PROC.
