Merge branch 'jc/boundary'
authorJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 06:02:52 +0000 (23:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 06:02:52 +0000 (23:02 -0700)
* 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

1  2 
revision.h
diff --combined revision.h
index cf337136086073d9d1356d615ac104d83c53b11a,1885f8d233f5b30eb8d184192d51eaffb6e3320b..6ae39e6bec180769df0bccccdf652ad0ffd784f0
@@@ -7,7 -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 +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;
                        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,
@@@ -74,7 -77,6 +77,7 @@@
        const char      *add_signoff;
        const char      *extra_headers;
        const char      *log_reencode;
 +      int             no_inline;
  
        /* Filter by commit log message */
        struct grep_opt *grep_filter;