aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-base.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-05 18:25:10 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-09 00:43:46 -0800
commit0ab9e1e8cdaefdd33bf24bb0be0ec766483f8bbe (patch)
tree2a6e35a280418d28b11d8cbd65371e1a1f50b549 /builtin-merge-base.c
parent50753d00d691c1ea16bc72446705aee2c128fc2f (diff)
downloadgit-0ab9e1e8cdaefdd33bf24bb0be0ec766483f8bbe.tar.gz
git-0ab9e1e8cdaefdd33bf24bb0be0ec766483f8bbe.tar.xz
Add 'df_name_compare()' helper function
This new helper is identical to base_name_compare(), except it compares conflicting directory/file entries as equal in order to help handling DF conflicts (thus the name). Note that while a directory name compares as equal to a regular file with the new helper, they then individually compare _differently_ to a filename that has a dot after the basename (because '\0' < '.' < '/'). So a directory called "foo/" will compare equal to a file "foo", even though "foo.c" will compare after "foo" and before "foo/" This will be used by routines that want to traverse the git namespace but then handle conflicting entries together when possible. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-base.c')
0 files changed, 0 insertions, 0 deletions