has_dir_name(): do not get confused by characters < '/'

[thirdparty/git.git] / t / t0000-basic.sh

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 502b4bcf9ea0ad06cddaad50b999dd8024af28eb..2ba219b18be6f04619301713a8d65528a400e7cf 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -1200,6 +1200,34 @@ test_expect_success 'very long name in the index handled sanely' '
        test $len = 4098
 '
 
+# D/F conflict checking uses an optimization when adding to the end.
+# make sure it does not get confused by `a-` sorting _between_
+# `a` and `a/`.
+test_expect_success 'more update-index D/F conflicts' '
+       # empty the index to make sure our entry is last
+       git read-tree --empty &&
+       cacheinfo=100644,$(test_oid empty_blob) &&
+       git update-index --add --cacheinfo $cacheinfo,path5/a &&
+
+       test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/file &&
+       test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/file &&
+       test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/c/file &&
+
+       # "a-" sorts between "a" and "a/"
+       git update-index --add --cacheinfo $cacheinfo,path5/a- &&
+
+       test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/file &&
+       test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/file &&
+       test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/c/file &&
+
+       cat >expected <<-\EOF &&
+       path5/a
+       path5/a-
+       EOF
+       git ls-files >actual &&
+       test_cmp expected actual
+'
+
 test_expect_success 'test_must_fail on a failing git command' '
        test_must_fail git notacommand
 '