diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 21:21:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 21:21:33 (GMT) |
| commit | 880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf (patch) | |
| tree | 8f8b8c40c0e6914a81d5ac2c3b3658389f06de10 /t/test-lib.sh | |
| parent | 327b3f8459a316aa5c27a8784f0f504122fce60e (diff) | |
| parent | 6d6a782fbf83927212f348f91823d886c5cd6d85 (diff) | |
| download | git-880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf.zip git-880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf.tar.gz git-880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf.tar.bz2 | |
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/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 11201e9..2e5afd6 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -162,6 +162,9 @@ _x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05" # Zero SHA-1 _z40=0000000000000000000000000000000000000000 +EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 + # Line feed LF=' ' @@ -170,7 +173,7 @@ LF=' # when case-folding filenames u200c=$(printf '\342\200\214') -export _x05 _x40 _z40 LF u200c +export _x05 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB # Each test should start with something like this, after copyright notices: # |