From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Apr 2012 20:58:02 +0000 (-0700)
Subject: Merge branch 'cb/cherry-pick-rev-path-confusion'
X-Git-Tag: v1.7.11-rc0~96
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fe59d768643df4bcab419bb52509cf608dc074b;p=git.git

Merge branch 'cb/cherry-pick-rev-path-confusion'

The command line parser choked "git cherry-pick $name" when $name can be
both revision name and a pathname, even though $name can never be a path
in the context of the command.

The issue the patch addresses is real, but the way it is implemented felt
unnecessarily invasive a bit.  It may be cleaner for this caller to add
the "--" to the end of the argv_array it passes to setup_revisions().

By Clemens Buchacher
* cb/cherry-pick-rev-path-confusion:
  cherry-pick: do not expect file arguments
---

0fe59d768643df4bcab419bb52509cf608dc074b