Merge branch 'mz/cherry-code-cleanup'
commit8748f3c52ec414932dbf6ac3a22d87d5c881a612
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2012 21:49:29 +0000 (29 14:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2012 21:49:29 +0000 (29 14:49 -0700)
treeed3a217f69c9baabeaa8937580a627327cdcad81
parent31e0100e89c3f7c05bd7fdf54e084b2039d398ec
parent51f4de3ac993b52c8a2fab9ca3acc665fca2d833
Merge branch 'mz/cherry-code-cleanup'

Minor code clean-up on the cherry-pick codepath.

* mz/cherry-code-cleanup:
  cherry: remove redundant check for merge commit
  cherry: don't set ignored rev_info options
  remove unnecessary parameter from get_patch_ids()