diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:33 -0700 |
| commit | 880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf (patch) | |
| tree | 8f8b8c40c0e6914a81d5ac2c3b3658389f06de10 /t/t3102-ls-tree-wildcards.sh | |
| parent | Merge branch 'mh/blame-worktree' into maint (diff) | |
| parent | cache-tree: do not generate empty trees as a result of all i-t-a subentries (diff) | |
| download | tgif-880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf.tar.xz | |
Merge branch 'nd/cache-tree-ita' into maint
"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/t3102-ls-tree-wildcards.sh')
| -rwxr-xr-x | t/t3102-ls-tree-wildcards.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh index 4d4b02e760..e804377f1c 100755 --- a/t/t3102-ls-tree-wildcards.sh +++ b/t/t3102-ls-tree-wildcards.sh @@ -12,16 +12,16 @@ test_expect_success 'setup' ' ' test_expect_success 'ls-tree a[a] matches literally' ' - cat >expect <<-\EOF && - 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 a[a]/three + cat >expect <<-EOF && + 100644 blob $EMPTY_BLOB a[a]/three EOF git ls-tree -r HEAD "a[a]" >actual && test_cmp expect actual ' test_expect_success 'ls-tree outside prefix' ' - cat >expect <<-\EOF && - 100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ../a[a]/three + cat >expect <<-EOF && + 100644 blob $EMPTY_BLOB ../a[a]/three EOF ( cd aa && git ls-tree -r HEAD "../a[a]"; ) >actual && test_cmp expect actual |