Merge branch 'jc/cache-tree' into next

* jc/cache-tree: git-write-tree writes garbage on sparc64
2006-05-28 13:39:51 -07:00 · 2006-05-28 13:39:51 -07:00 · 47e68cd803
commit 47e68cd803
parent 15cee32e2c ac58c7b18e
1 changed files with 1 additions and 1 deletions
--- 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);