diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 22:49:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 22:49:27 (GMT) |
| commit | cf479b4fb5d8417ccea306fa9f3491ec2e873399 (patch) | |
| tree | 372268c7b11fe5889f43a58f24d861c90373ff81 /t | |
| parent | b3dac9c07858e7b8b9c99a371c67129c2e7909e3 (diff) | |
| parent | d5eb3cf5e7e4274e12e0f249b3a026c029f3b02c (diff) | |
| download | git-cf479b4fb5d8417ccea306fa9f3491ec2e873399.zip git-cf479b4fb5d8417ccea306fa9f3491ec2e873399.tar.gz git-cf479b4fb5d8417ccea306fa9f3491ec2e873399.tar.bz2 | |
Merge branch 'ls/p4-empty-file-on-lfs' into maint
"git p4" LFS support was broken when LFS stores an empty blob.
* ls/p4-empty-file-on-lfs:
git-p4: fix empty file processing for large file system backend GitLFS
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9824-git-p4-git-lfs.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh index 110a7e7..734b8db 100755 --- a/t/t9824-git-p4-git-lfs.sh +++ b/t/t9824-git-p4-git-lfs.sh @@ -42,6 +42,8 @@ test_expect_success 'Create repo with binary files' ' ( cd "$cli" && + >file0.dat && + p4 add file0.dat && echo "content 1 txt 23 bytes" >file1.txt && p4 add file1.txt && echo "content 2-3 bin 25 bytes" >file2.dat && |