diff options
author | David Meybohm <dmeybohmlkml@bellsouth.net> | 2005-05-26 22:59:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-27 10:34:24 -0700 |
commit | 8310c2c0b585d3ac35a275f795e15fd9887e8b7d (patch) | |
tree | f6db9be9d431080d9e7f61edb616b8bac8c9618f /pull.c | |
parent | git-diff-tree: simplify header output with '-z' (diff) | |
download | tgif-8310c2c0b585d3ac35a275f795e15fd9887e8b7d.tar.xz |
[PATCH] check_file_directory_conflict path fix
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: David Meybohm <dmeybohmlkml@bellsouth.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'pull.c')
0 files changed, 0 insertions, 0 deletions