On Mon, 28 Aug 2006, Krzysztof Halasa wrote: > > Linus Torvalds <torvalds@xxxxxxxx> writes: > > > In related news, the question is what to do about the inadvertent > > collision.. First off, let me remind people that the inadvertent kind > > of collision is really really _really_ damn unlikely, so we'll quite > > likely never ever see it in the full history of the universe. > > Actually I think we may see it when somebody tries to put a real > example of conflicting SHA-1 pair into git repository. Well, by definition, I wouldn't call that "inadvertent" ;) Anyway, the way to do it (if you want to use git to document SHA1 hash mismatches) is to just check the files that have an identical SHA1 in. It will magically work! Why? Because a git SHA1 is actually _not_ the SHA1 of the file itself, it's the SHA1 of the file _with_the_git_header_added_. So if you find two files that have the same SHA1, they would also have to have the same length in order to actually generate the same object name. If they have different lenths, you can just check them into git, and they'll get two different git SHA1 names and you'll have a cool git archive that when you check the files out, they checked-out files will share the same SHA1 ;) Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html