summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:35:54 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:35:54 -0700
commit8f4c996fc32087955e6def30e669ba6d27cec11e (patch)
tree9e8274b0cb105ddd53cf021235abfde90795d943 /revision.h
parent6be70d6bb94c625d912ebaef312c5dc5a397ec24 (diff)
parentc05b988a69c10d7eef2f34932eed61923c18b4a5 (diff)
downloadgit-8f4c996fc32087955e6def30e669ba6d27cec11e.tar.gz
Merge branch 'bk/ancestry-path'
* bk/ancestry-path: t6019: avoid refname collision on case-insensitive systems revision: do not include sibling history in --ancestry-path output revision: keep track of the end-user input from the command line rev-list: Demonstrate breakage with --ancestry-path --all
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/revision.h b/revision.h
index 3d64adad18..93d31556cb 100644
--- a/revision.h
+++ b/revision.h
@@ -24,6 +24,23 @@ struct rev_info;
struct log_info;
struct string_list;
+struct rev_cmdline_info {
+ unsigned int nr;
+ unsigned int alloc;
+ struct rev_cmdline_entry {
+ struct object *item;
+ const char *name;
+ enum {
+ REV_CMD_REF,
+ REV_CMD_PARENTS_ONLY,
+ REV_CMD_LEFT,
+ REV_CMD_RIGHT,
+ REV_CMD_REV
+ } whence;
+ unsigned flags;
+ } *rev;
+};
+
struct rev_info {
/* Starting list */
struct commit_list *commits;
@@ -32,6 +49,9 @@ struct rev_info {
/* Parents of shown commits */
struct object_array boundary_commits;
+ /* The end-points specified by the end user */
+ struct rev_cmdline_info cmdline;
+
/* Basic information */
const char *prefix;
const char *def;