| commit | 12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sun, 19 Jun 2005 03:21:34 +0000 (18 20:21 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sun, 19 Jun 2005 03:21:34 +0000 (18 20:21 -0700) | ||
| tree | 664d4b3dc518c63e0b5b3e815126e72fe40dc224 | treesnapshot (tar.gz zip) |
| parent | 3d958064e0f26f3cbd5b201f295c182b6aa119da | commitdiff |
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.
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.
| read-cache.c | diffblobblamehistory |