diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-25 21:13:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-25 21:13:44 (GMT) |
| commit | 3cc75c10d781572a073d7dbff4e1695b93a89d48 (patch) | |
| tree | 59d0a135bb8b2b20604b7ccd15066a19ad29af0c /t/t1011-read-tree-sparse-checkout.sh | |
| parent | 0d54ad9cd44231c33f5776f67afea924c9a589b3 (diff) | |
| parent | 6d6a782fbf83927212f348f91823d886c5cd6d85 (diff) | |
| download | git-3cc75c10d781572a073d7dbff4e1695b93a89d48.zip git-3cc75c10d781572a073d7dbff4e1695b93a89d48.tar.gz git-3cc75c10d781572a073d7dbff4e1695b93a89d48.tar.bz2 | |
Merge branch 'nd/cache-tree-ita'
"git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".
* nd/cache-tree-ita:
cache-tree: do not generate empty trees as a result of all i-t-a subentries
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
test-lib.sh: introduce and use $EMPTY_BLOB
test-lib.sh: introduce and use $EMPTY_TREE
Diffstat (limited to 't/t1011-read-tree-sparse-checkout.sh')
| -rwxr-xr-x | t/t1011-read-tree-sparse-checkout.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index e5fa235..c167f60 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -15,11 +15,11 @@ test_description='sparse checkout tests . "$TEST_DIRECTORY"/lib-read-tree.sh test_expect_success 'setup' ' - cat >expected <<-\EOF && + cat >expected <<-EOF && 100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0 init.t - 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/added - 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 sub/addedtoo - 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 subsub/added + 100644 $EMPTY_BLOB 0 sub/added + 100644 $EMPTY_BLOB 0 sub/addedtoo + 100644 $EMPTY_BLOB 0 subsub/added EOF cat >expected.swt <<-\EOF && H init.t |