Merge fighting fsck-cache updates from Junio
commitfead2836a16829fba427635f92d7df9acf771a55
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 22:20:10 +0000 (28 15:20 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 22:20:10 +0000 (28 15:20 -0700)
tree0c3d06b55308b094e8486ab8a4d02b381472a834
parentd85a4feeee2cb94ff7060de45a5421f575ddf7b8
parent8a498a05c3c6b2f53db669b24f36257ab213eb4c
Merge fighting fsck-cache updates from Junio

It's just easier to let git help out with the merge than it is to try to
fix up the diffs.
sha1_file.c