summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-27 13:58:02 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-27 13:58:02 -0700
commit0fe59d768643df4bcab419bb52509cf608dc074b (patch)
tree6a366154679e53f443042a0c1a791802ed52fdf5 /revision.h
parent157a4767a56e37def5e156b60f03ee220208d8fb (diff)
parent6d5b93f29f5362b9b84954d87684705227984f9e (diff)
downloadgit-0fe59d768643df4bcab419bb52509cf608dc074b.tar.gz
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
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 eb87fd1e2f..863f4f6454 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);