diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 00:15:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 00:15:22 -0700 |
| commit | aebd173ffa7a4e67447f0157a14abde7767c54e9 (patch) | |
| tree | 2c3c660e441d93120a42cfac5c909dcbd2f5b275 /builtin-pack-objects.c | |
| parent | f6576f4c0c6fa3b2d979faf28936c09480dedaab (diff) | |
| parent | 1a9016aae5aa8c468bb2d8d5dd16303d5c005869 (diff) | |
| download | git-aebd173ffa7a4e67447f0157a14abde7767c54e9.tar.gz | |
Merge branch 'maint'
* maint:
Start 1.6.0.4 cycle
add instructions on how to send patches to the mailing list with Gmail
Documentation/gitattributes: Add subsection header for each attribute
git send-email: avoid leaking directory file descriptors.
send-pack: do not send out single-level refs such as refs/stash
fix overlapping memcpy in normalize_absolute_path
pack-objects: avoid reading uninitalized data
correct cache_entry allocation
Conflicts:
RelNotes
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 59c30d1caa..15b80db5a1 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1375,7 +1375,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size, array = xcalloc(window, sizeof(struct unpacked)); for (;;) { - struct object_entry *entry = *list++; + struct object_entry *entry; struct unpacked *n = array + idx; int j, max_depth, best_base = -1; @@ -1384,6 +1384,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size, progress_unlock(); break; } + entry = *list++; (*list_size)--; if (!entry->preferred_base) { (*processed)++; |