From: Junio C Hamano <junkio@cox.net>
Date: Wed, 23 May 2007 07:17:47 +0000 (-0700)
Subject: Merge branch 'jn/lstree'
X-Git-Tag: v1.5.3-rc0~206
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2555699aa2863861e32d222ede2c3df2dbf92088;p=git.git

Merge branch 'jn/lstree'

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

2555699aa2863861e32d222ede2c3df2dbf92088
diff --cc builtin-ls-tree.c
index 9a5977fb9,ccba2aa8e..cb4be4fab
--- a/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?
  		 *