diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:02:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:02:52 -0700 |
| commit | 2422f1ca3b94358e88f8508730a9d8ebcf020547 (patch) | |
| tree | c663e17ffd76f7bebefad78bbeb8177d760317aa /revision.h | |
| parent | f43cd49fb82b0eee10b88833b58edd711fe8298d (diff) | |
| parent | 2e578f9a4f08ade4e8da52614c566e5dc1c8ca00 (diff) | |
| download | git-2422f1ca3b94358e88f8508730a9d8ebcf020547.tar.gz | |
Merge branch 'jc/boundary'
* jc/boundary:
git-bundle: prevent overwriting existing bundles
git-bundle: die if a given ref is not included in bundle
git-bundle: handle thin packs in subcommand "unbundle"
git-bundle: Make thin packs
git-bundle: avoid packing objects which are in the prerequisites
bundle: fix wrong check of read_header()'s return value & add tests
revision --boundary: fix uncounted case.
revision --boundary: fix stupid typo
git-bundle: make verify a bit more chatty.
revision traversal: SHOWN means shown
git-bundle: various fixups
revision traversal: retire BOUNDARY_SHOW
revision walker: Fix --boundary when limited
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/revision.h b/revision.h index cf33713608..6ae39e6bec 100644 --- a/revision.h +++ b/revision.h @@ -7,7 +7,7 @@ #define SHOWN (1u<<3) #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ #define BOUNDARY (1u<<5) -#define BOUNDARY_SHOW (1u<<6) +#define CHILD_SHOWN (1u<<6) #define ADDED (1u<<7) /* Parents already parsed and added? */ #define SYMMETRIC_LEFT (1u<<8) @@ -21,6 +21,9 @@ struct rev_info { struct commit_list *commits; struct object_array pending; + /* Parents of shown commits */ + struct object_array boundary_commits; + /* Basic information */ const char *prefix; void *prune_data; @@ -40,10 +43,10 @@ struct rev_info { edge_hint:1, limited:1, unpacked:1, /* see also ignore_packed below */ - boundary:1, + boundary:2, left_right:1, parents:1, - reverse:2; + reverse:1; /* Diff flags */ unsigned int diff:1, |