diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:10:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:10:20 -0800 |
| commit | 62cdb6b23a7c6cf527d8f8c470c7d463f6ca9f6d (patch) | |
| tree | fdcb93f4cd15caafa1aa7f506202e7f42ff30c7c /builtin/pack-objects.c | |
| parent | 9a6e2d77e91af34ebc6679ba3250524504083284 (diff) | |
| parent | ea4f9685cb432caf357ad8af56a91877b6d04663 (diff) | |
| download | git-62cdb6b23a7c6cf527d8f8c470c7d463f6ca9f6d.tar.gz | |
Merge branch 'nd/misc-cleanups'
* nd/misc-cleanups:
unpack_object_header_buffer(): clear the size field upon error
tree_entry_interesting: make use of local pointer "item"
tree_entry_interesting(): give meaningful names to return values
read_directory_recursive: reduce one indentation level
get_tree_entry(): do not call find_tree_entry() on an empty tree
tree-walk.c: do not leak internal structure in tree_entry_len()
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 824ecee20b..558cd34bcc 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1015,7 +1015,7 @@ static void add_pbase_object(struct tree_desc *tree, while (tree_entry(tree,&entry)) { if (S_ISGITLINK(entry.mode)) continue; - cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 : + cmp = tree_entry_len(&entry) != cmplen ? 1 : memcmp(name, entry.path, cmplen); if (cmp > 0) continue; |