Merge branch 'nd/misc-cleanups'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:10:20 +0000 (15:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:10:20 +0000 (15:10 -0800)
* 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()

1  2 
builtin/grep.c
builtin/pack-objects.c
sha1_file.c

diff --cc builtin/grep.c
Simple merge
Simple merge
diff --cc sha1_file.c
Simple merge