diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:02:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:02:51 -0800 |
| commit | df6246ed78d040f06f095dd62d8db07a0aa19a96 (patch) | |
| tree | cf9da0c48aa9450471d5c09a659cc99a1d3e1159 /builtin/pack-objects.c | |
| parent | 8311158c66e0d83df950ea837fb1cb332c51f798 (diff) | |
| parent | ea4f9685cb432caf357ad8af56a91877b6d04663 (diff) | |
| download | git-df6246ed78d040f06f095dd62d8db07a0aa19a96.tar.gz git-df6246ed78d040f06f095dd62d8db07a0aa19a96.tar.xz | |
Merge branch 'nd/misc-cleanups' into maint
* 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 824ecee20..558cd34bc 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; |