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 /unpack-trees.c | |
| parent | f6576f4c0c6fa3b2d979faf28936c09480dedaab (diff) | |
| parent | 1a9016aae5aa8c468bb2d8d5dd16303d5c005869 (diff) | |
| download | git-aebd173ffa7a4e67447f0157a14abde7767c54e9.tar.gz git-aebd173ffa7a4e67447f0157a14abde7767c54e9.tar.xz | |
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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index e59d144d2..e5749ef63 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -382,7 +382,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->merge_size = len; if (!dfc) - dfc = xcalloc(1, sizeof(struct cache_entry) + 1); + dfc = xcalloc(1, cache_entry_size(0)); o->df_conflict_entry = dfc; if (len) { |