diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-02 05:34:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-02 05:34:19 (GMT) |
| commit | 3c91bf6805249d0f59ddff4e5dc4118127527243 (patch) | |
| tree | 8f07aa193c5206f736c1dbe2e3ac688938704636 /cache.h | |
| parent | 988d9fd8a42b388c30625378dcb521a3b2021b72 (diff) | |
| parent | 094085e3362c592c932b41525ed37152ec171192 (diff) | |
| download | git-3c91bf6805249d0f59ddff4e5dc4118127527243.zip git-3c91bf6805249d0f59ddff4e5dc4118127527243.tar.gz git-3c91bf6805249d0f59ddff4e5dc4118127527243.tar.bz2 | |
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 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -655,7 +655,6 @@ extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned l extern int move_temp_to_file(const char *tmpfile, const char *filename); extern int has_sha1_pack(const unsigned char *sha1); -extern int has_sha1_kept_pack(const unsigned char *sha1); extern int has_sha1_file(const unsigned char *sha1); extern int has_loose_object_nonlocal(const unsigned char *sha1); |