diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-30 16:02:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-30 16:02:07 -0800 |
| commit | 4508dde16951df00529207f179fee405e8646a64 (patch) | |
| tree | f878eb84c0da830794674969fa6ff310453145a0 /sha1_file.c | |
| parent | 5ca807842fcb709757147df0044e8b4b2946ea22 (diff) | |
| download | git-4508dde16951df00529207f179fee405e8646a64.tar.gz git-4508dde16951df00529207f179fee405e8646a64.tar.xz | |
Revert "send-pack --keep: do not explode into loose objects on the receiving end."
This reverts commit c7740a943ec896247ebc5514b6be02710caf3c53. There should
be a way to make this controllable from the receiver end.
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sha1_file.c b/sha1_file.c index 278ba2f4c..e89d24c01 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1292,7 +1292,7 @@ static void *read_packed_sha1(const unsigned char *sha1, char *type, unsigned lo return unpack_entry(&e, type, size); } -void *read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size) +void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size) { unsigned long mapsize; void *map, *buf; @@ -1757,10 +1757,7 @@ int has_sha1_file(const unsigned char *sha1) if (find_pack_entry(sha1, &e, NULL)) return 1; - if (find_sha1_file(sha1, &st)) - return 1; - reprepare_packed_git(); - return find_pack_entry(sha1, &e, NULL); + return find_sha1_file(sha1, &st) ? 1 : 0; } /* |