Merge branch 'jn/lstree'

* jn/lstree:
  Add an option to git-ls-tree to display also the size of blob

diff --cc builtin-ls-tree.c
index 9a5977fb99c3c61522fee3678fb94b1815575c61,ccba2aa8e1a635f14650e5ee0d91298593c300bc..cb4be4fabb84bafd5518e81d2fd0ed6ee191641c
--- 1/builtin-ls-tree.c
--- 2/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@@ -59,8 -60,9 +60,9 @@@ static int show_tree(const unsigned cha
  {
        int retval = 0;
        const char *type = blob_type;
+       unsigned long size;
  
 -      if (S_ISDIRLNK(mode)) {
 +      if (S_ISGITLINK(mode)) {
                /*
                 * Maybe we want to have some recursive version here?
                 *