From 0492eb48c4415b662e40d3af0592290a2fdba64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= Date: Sun, 24 Apr 2016 13:50:21 +0200 Subject: t9824: fix broken &&-chain in a subshell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SZEDER Gábor Acked-by: Lars Shneider Signed-off-by: Junio C Hamano --- t/t9824-git-p4-git-lfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh index 0b664a377c..64f8d18216 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 13 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" && test_file_count_in_dir ".git/lfs/objects" 1 && cat >expect <<-\EOF && -- cgit v1.2.1 From 9e220fedf81cace5172ed86014e9ad425f7f3250 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Fri, 29 Apr 2016 15:57:02 +0000 Subject: t9824: fix wrong reference value 0492eb48 (t9824: fix broken &&-chain in a subshell, 2016-04-24) revealed a test that was broken from the beginning, as it expected a wrong size. The expected size of the file under test is 39 bytes. The test checked that the size is 13 bytes, but this was not noticed because it was breaking the &&-chain. Fix the reference value to make the test pass. Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- t/t9824-git-p4-git-lfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh index 64f8d18216..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 && -- cgit v1.2.1