diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-01 22:34:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-01 22:34:19 -0700 |
commit | 3c91bf6805249d0f59ddff4e5dc4118127527243 (patch) | |
tree | 8f07aa193c5206f736c1dbe2e3ac688938704636 /revision.h | |
parent | 988d9fd8a42b388c30625378dcb521a3b2021b72 (diff) | |
parent | 094085e3362c592c932b41525ed37152ec171192 (diff) | |
download | git-3c91bf6805249d0f59ddff4e5dc4118127527243.tar.gz |
Merge branch 'jc/maint-1.6.0-keep-pack'
* 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
Conflicts:
t/t7700-repack.sh
Diffstat (limited to 'revision.h')
-rw-r--r-- | revision.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/revision.h b/revision.h index ad123d78c5..6e98b71b49 100644 --- a/revision.h +++ b/revision.h @@ -50,7 +50,6 @@ struct rev_info { edge_hint:1, limited:1, unpacked:1, - kept_pack_only:1, boundary:2, left_right:1, rewrite_parents:1, |