diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:49:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:49:56 -0700 |
| commit | aec813062b340e6bb181470cf57cc4b4406e1bb8 (patch) | |
| tree | bb2b33ca6b89fdfd8d0e4b2e6d34f5a806674b67 /revision.h | |
| parent | Merge branch 'rs/memmem' (diff) | |
| parent | is_kept_pack(): final clean-up (diff) | |
| download | tgif-aec813062b340e6bb181470cf57cc4b4406e1bb8.tar.xz | |
Merge branch 'jc/maint-1.6.0-keep-pack'
* jc/maint-1.6.0-keep-pack:
is_kept_pack(): final clean-up
Simplify is_kept_pack()
Consolidate ignore_packed logic more
has_sha1_kept_pack(): take "struct rev_info"
has_sha1_pack(): refactor "pretend these packs do not exist" interface
git-repack: resist stray environment variable
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/revision.h b/revision.h index 8c0a41713c..ad123d78c5 100644 --- a/revision.h +++ b/revision.h @@ -49,7 +49,8 @@ struct rev_info { blob_objects:1, edge_hint:1, limited:1, - unpacked:1, /* see also ignore_packed below */ + unpacked:1, + kept_pack_only:1, boundary:2, left_right:1, rewrite_parents:1, @@ -80,9 +81,6 @@ struct rev_info { missing_newline:1; enum date_mode date_mode; - const char **ignore_packed; /* pretend objects in these are unpacked */ - int num_ignore_packed; - unsigned int abbrev; enum cmit_fmt commit_format; struct log_info *loginfo; |