From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 19 Jun 2005 03:21:34 +0000 (-0700)
Subject: Re-implement "check_file_directory_conflict()"
X-Git-Tag: v0.99~251
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9?ds=sidebyside;hp=12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9

Re-implement "check_file_directory_conflict()"

This is (imho) more readable, and is also a lot faster.  The expense of
looking up sub-directory beginnings was killing us on things like
"git-diff-cache", even though that one didn't even care at all about the
file vs directory conflicts.

We really only care when somebody tries to add a conflicting name to
stage 0.

We should go through the conflict rules more carefully some day.
---