From: Junio C Hamano <junkio@cox.net>
Date: Sun, 28 May 2006 20:39:51 +0000 (-0700)
Subject: Merge branch 'jc/cache-tree' into next
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=47e68cd803d9dace40984ea965afb54a72609a91;hp=15cee32e2cd6c64ce684c7830453668363c8b2be;p=git.git

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  git-write-tree writes garbage on sparc64
---

diff --git a/read-cache.c b/read-cache.c
index 36bd4ea0..c499c518 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -826,7 +826,7 @@ static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
 }
 
 static int write_index_ext_header(SHA_CTX *context, int fd,
-				  unsigned long ext, unsigned long sz)
+				  unsigned int ext, unsigned int sz)
 {
 	ext = htonl(ext);
 	sz = htonl(sz);