From d3bc95fd664095a0c8dfcdf99f62741b1ecd6ffc Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 25 Mar 2014 12:37:05 -0700 Subject: Update behavior for untracked sub-repos When a directory containing a .git directory (or even just a plain gitlink) was found, libgit2 was going out of its way to treat it specially. This seemed like it was necessary because the diff code was not originally emulating Git's behavior for untracked directories correctly (i.e. scanning for ignored vs untracked items inside). Now that libgit2 diff mimics Git's untracked directory behavior, the special handling for contained Git repos is actually incorrect and this commit rips it out. --- tests/diff/iterator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/diff/iterator.c') diff --git a/tests/diff/iterator.c b/tests/diff/iterator.c index 92e6f723b..891d8a6e5 100644 --- a/tests/diff/iterator.c +++ b/tests/diff/iterator.c @@ -737,13 +737,13 @@ void test_diff_iterator__workdir_builtin_ignores(void) { "root_test2", false }, { "root_test3", false }, { "root_test4.txt", false }, - { "sub", false }, + { "sub/", false }, { "sub/.gitattributes", false }, { "sub/abc", false }, { "sub/dir/", true }, { "sub/file", false }, { "sub/ign/", true }, - { "sub/sub", false }, + { "sub/sub/", false }, { "sub/sub/.gitattributes", false }, { "sub/sub/dir", false }, /* file is not actually a dir */ { "sub/sub/file", false }, -- cgit v1.2.1