diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:21:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:21:10 -0700 |
| commit | c3067cbfb3fbab32177d5f61ea73127f08ab43cb (patch) | |
| tree | 0f6ee3c2d1835d591ca96df058c021b848be95b9 /revision.h | |
| parent | 61e6108d94353d932d397e4be498c7e5293723eb (diff) | |
| parent | 094085e3362c592c932b41525ed37152ec171192 (diff) | |
| download | git-c3067cbfb3fbab32177d5f61ea73127f08ab43cb.tar.gz | |
Merge branch 'jc/maint-1.6.0-keep-pack' into maint
* jc/maint-1.6.0-keep-pack:
pack-objects: don't loosen objects available in alternate or kept packs
t7700: demonstrate repack flaw which may loosen objects unnecessarily
Remove --kept-pack-only option and associated infrastructure
pack-objects: only repack or loosen objects residing in "local" packs
git-repack.sh: don't use --kept-pack-only option to pack-objects
t7700-repack: add two new tests demonstrating repacking flaws
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
Conflicts:
t/t7700-repack.sh
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/revision.h b/revision.h index 7cf848771b..66d211ac2e 100644 --- a/revision.h +++ b/revision.h @@ -49,7 +49,7 @@ struct rev_info { blob_objects:1, edge_hint:1, limited:1, - unpacked:1, /* see also ignore_packed below */ + unpacked:1, boundary:2, left_right:1, rewrite_parents:1, @@ -80,9 +80,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; |