From 680be044d98b3b703bc33d546a987c19b3779aeb Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Fri, 23 Aug 2013 16:26:59 -0700 Subject: [PATCH] dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage directory_exists_in_index() takes pathname and its length, but its helper function directory_exists_in_index_icase() reads one byte beyond the end of the pathname and expects there to be a '/'. This needs to be fixed, as that one-byte-beyond-the-end location may not even be readable, possibly by not registering directories to name hashes with trailing slashes. In the meantime, update the new caller added recently to treat_one_path() to make sure that the path buffer it gives the function is one byte longer than the path it is asking the function about by appending a slash to it. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- dir.c | 18 +++++++++++++++--- t/t3010-ls-files-killed-modified.sh | 15 +++++++++------ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dir.c b/dir.c index ff768f31af..1000dc2368 100644 --- a/dir.c +++ b/dir.c @@ -1202,9 +1202,21 @@ static enum path_treatment treat_one_path(struct dir_struct *dir, */ if ((dir->flags & DIR_COLLECT_KILLED_ONLY) && (dtype == DT_DIR) && - !has_path_in_index && - (directory_exists_in_index(path->buf, path->len) == index_nonexistent)) - return path_none; + !has_path_in_index) { + /* + * NEEDSWORK: directory_exists_in_index_icase() + * assumes that one byte past the given path is + * readable and has '/', which needs to be fixed, but + * until then, work it around in the caller. + */ + strbuf_addch(path, '/'); + if (directory_exists_in_index(path->buf, path->len - 1) == + index_nonexistent) { + strbuf_setlen(path, path->len - 1); + return path_none; + } + strbuf_setlen(path, path->len - 1); + } exclude = is_excluded(dir, path->buf, &dtype); diff --git a/t/t3010-ls-files-killed-modified.sh b/t/t3010-ls-files-killed-modified.sh index 6ea7ca8265..ab1deae3b2 100755 --- a/t/t3010-ls-files-killed-modified.sh +++ b/t/t3010-ls-files-killed-modified.sh @@ -78,9 +78,6 @@ date >path7 touch path10 >pathx/ju/nk -test_expect_success \ - 'git ls-files -k to show killed files.' \ - 'git ls-files -k >.output' cat >.expected <.output && + test_cmp .expected .output +' + +test_expect_success 'git ls-files -k to show killed files (w/ icase)' ' + git -c core.ignorecase=true ls-files -k >.output && + test_cmp .expected .output +' test_expect_success \ 'git ls-files -m to show modified files.' \