diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 20:21:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 20:21:34 -0700 |
| commit | 12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9 (patch) | |
| tree | 664d4b3dc518c63e0b5b3e815126e72fe40dc224 /git-external-diff-script | |
| parent | Avoid warning about function without return. (diff) | |
| download | tgif-12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9.tar.xz | |
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.
Diffstat (limited to 'git-external-diff-script')
0 files changed, 0 insertions, 0 deletions