diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:08 -0700 |
| commit | 7ab6da3c40420c297016c0a62bece1573d0589ce (patch) | |
| tree | 94ee06a270ec02405914a4bd6bcf91595422fb4d | |
| parent | f735a50ffdf0e1734438f0c0e6d70c4a81eea09e (diff) | |
| parent | 9e220fedf81cace5172ed86014e9ad425f7f3250 (diff) | |
| download | git-7ab6da3c40420c297016c0a62bece1573d0589ce.tar.gz | |
Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
Fix a broken test.
* ls/p4-lfs-test-fix-2.7.0:
t9824: fix wrong reference value
t9824: fix broken &&-chain in a subshell
| -rwxr-xr-x | t/t9824-git-p4-git-lfs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh index 0b664a377c..3fc6790b07 100755 --- a/t/t9824-git-p4-git-lfs.sh +++ b/t/t9824-git-p4-git-lfs.sh @@ -265,7 +265,7 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr # We only import HEAD here ("@all" is missing!) git p4 clone --destination="$git" //depot && - test_file_in_lfs file6.bin 13 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" + test_file_in_lfs file6.bin 39 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" && test_file_count_in_dir ".git/lfs/objects" 1 && cat >expect <<-\EOF && |