diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-21 00:45:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-21 00:45:55 -0700 |
| commit | d1e36c796deda7818220353a61b3f3c854058a66 (patch) | |
| tree | 30519a7c31e9d210da600ffd6a13d933f4795064 /pack-objects.c | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-d1e36c796deda7818220353a61b3f3c854058a66.tar.xz | |
Merge branch 'master' into next
* master:
fix pack-object buffer size
mailinfo: decode underscore used in "Q" encoding properly.
Reintroduce svn pools to solve the memory leak.
pack-objects: do not stop at object that is "too small"
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pack-objects.c b/pack-objects.c index 09f4f2c944..c0acc460bb 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -1052,7 +1052,7 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de if (cur_entry->delta) max_size = cur_entry->delta_size-1; if (sizediff >= max_size) - return -1; + return 0; delta_buf = diff_delta(old->data, oldsize, cur->data, size, &delta_size, max_size); if (!delta_buf) @@ -1231,7 +1231,7 @@ static void setup_progress_signal(void) int main(int argc, char **argv) { SHA_CTX ctx; - char line[PATH_MAX + 20]; + char line[40 + 1 + PATH_MAX + 2]; int window = 10, depth = 10, pack_to_stdout = 0; struct object_entry **list; int num_preferred_base = 0; |