summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2012-04-14 21:04:48 +0200
committerJunio C Hamano <gitster@pobox.com>2012-04-15 13:33:31 -0700
commit6d5b93f29f5362b9b84954d87684705227984f9e (patch)
tree14a0838e5657c9e29630b057d99ec4f460553743 /revision.h
parente8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d (diff)
downloadgit-6d5b93f29f5362b9b84954d87684705227984f9e.tar.gz
cherry-pick: do not expect file arguments
If a commit-ish passed to cherry-pick or revert happens to have a file of the same name, git complains that the argument is ambiguous and advises to use '--'. To make things worse, the '--' argument is removed by parse_options, und so passing '--' has no effect. Instead, always interpret cherry-pick/revert arguments as revisions. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h
index b8e9223954..1a0838473f 100644
--- a/revision.h
+++ b/revision.h
@@ -183,6 +183,7 @@ struct setup_revision_opt {
const char *def;
void (*tweak)(struct rev_info *, struct setup_revision_opt *);
const char *submodule;
+ int assume_dashdash;
};
extern void init_revisions(struct rev_info *revs, const char *prefix);