-
由 David Meybohm 提交于
check_file_directory_conflict can give the wrong answers. This is because the wrong length is passed to cache_name_pos. The length passed should be the length of the whole path from the root, not the length of each path subcomponent. $ git-init-db defaulting to local storage area $ mkdir path && touch path/file $ git-update-cache --add path/file $ rm path/file $ mkdir path/file && touch path/file/f $ git-update-cache --add path/file/f <-- Conflict ignored $ Signed-off-by: NDavid Meybohm <dmeybohmlkml@bellsouth.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
8310c2c0