Fix #509

akonwi · Nov 7, 2016 · 2cb0add · 2cb0add
1 parent 2414eec
commit 2cb0add
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/views/cherry-pick-select-commits-view.coffee b/lib/views/cherry-pick-select-commits-view.coffee
@@ -52,7 +52,7 @@ class CherryPickSelectCommits extends SelectListMultipleView
 
   completed: (items) ->
     @cancel()
-    commits = item.hash for item in items
+    commits = items.map (item) -> item.hash
     git.cmd(['cherry-pick'].concat(commits), cwd: @repo.getWorkingDirectory())
     .then (msg) -> notifier.addSuccess msg
     .catch (msg) -> notifier.addError msg
diff --git a/spec/views/cherry-pick-select-commit-view-spec.coffee b/spec/views/cherry-pick-select-commit-view-spec.coffee
@@ -12,5 +12,7 @@ describe "CherryPickSelectCommits view", ->
   it "calls git.cmd with 'cherry-pick' and the selected commits", ->
     spyOn(git, 'cmd').andReturn Promise.resolve 'success'
     @view.confirmSelection()
+    @view.selectNextItemView()
+    @view.confirmSelection()
     @view.find('.btn-pick-button').click()
-    expect(git.cmd).toHaveBeenCalledWith ['cherry-pick', 'commit1'], cwd: repo.getWorkingDirectory()
+    expect(git.cmd).toHaveBeenCalledWith ['cherry-pick', 'commit1', 'commit2'], cwd: repo.getWorkingDirectory()