summaryrefslogtreecommitdiff
path: root/t/t4027-diff-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-04 00:04:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-05 00:41:27 (GMT)
commit1392a377219adfee7cc7532e3c60e51d79ab40b1 (patch)
treeb0cb07a6fae8e9f67fcbe7d11e51d44aeb9fd6fc /t/t4027-diff-submodule.sh
parent27bfd950c19c76dce28a8c8693f4ed8603875d26 (diff)
downloadgit-1392a377219adfee7cc7532e3c60e51d79ab40b1.zip
git-1392a377219adfee7cc7532e3c60e51d79ab40b1.tar.gz
git-1392a377219adfee7cc7532e3c60e51d79ab40b1.tar.bz2
diff: a submodule not checked out is not modified
948dd34 (diff-index: careful when inspecting work tree items, 2008-03-30) made the work tree check careful not to be fooled by a new directory that exists at a place the index expects a blob. For such a change to be a typechange from blob to submodule, the new directory has to be a repository. However, if the index expects a submodule there, we should not insist the work tree entity to be a repository --- a simple directory that is not a full fledged repository (even an empty directory would do) should be considered an unmodified subproject, because that is how a superproject with a submodule is checked out sparsely by default. This makes the function check_work_tree_entity() even more careful not to report a submodule that is not checked out as removed. It fixes the recently added test in t4027. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4027-diff-submodule.sh')
-rwxr-xr-xt/t4027-diff-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 61caad0..ba6679c 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -50,7 +50,7 @@ test_expect_success 'git diff-files --raw' '
test_cmp expect actual.files
'
-test_expect_failure 'git diff (empty submodule dir)' '
+test_expect_success 'git diff (empty submodule dir)' '
: >empty &&
rm -rf sub/* sub/.git &&
git diff > actual.empty &&