summaryrefslogtreecommitdiff
path: root/git-log-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-19 03:21:34 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-19 03:21:34 (GMT)
commit12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9 (patch)
tree664d4b3dc518c63e0b5b3e815126e72fe40dc224 /git-log-script
parent3d958064e0f26f3cbd5b201f295c182b6aa119da (diff)
downloadgit-12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9.zip
git-12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9.tar.gz
git-12676608fefd6b148bd9fd4cbd4eb6c2ff3e15e9.tar.bz2
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-log-script')
0 files changed, 0 insertions, 0 deletions